Originally committed as revision 1912 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
@@ -163,6 +163,7 @@ const CodecTag codec_bmp_tags[] = { | |||||
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, | { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, | ||||
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') }, | { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') }, | ||||
{ CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, | { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, | ||||
{ CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') }, | |||||
{ 0, 0 }, | { 0, 0 }, | ||||
}; | }; | ||||
@@ -41,6 +41,9 @@ stddev: 8.87 bytes:7602176 | |||||
4b37703d3dc03873f99603165c0fe11e *./data/a-rv10.rm | 4b37703d3dc03873f99603165c0fe11e *./data/a-rv10.rm | ||||
255469fef47bee94cfb2e3385ebb736b *./data/out.yuv | 255469fef47bee94cfb2e3385ebb736b *./data/out.yuv | ||||
stddev: 13.42 bytes:7602176 | stddev: 13.42 bytes:7602176 | ||||
89ad858355f9b0a92d024c5ba6e369dd *./data/a-asv1.avi | |||||
b3e1696d73071c8f7f0ff4e10c1677ca *./data/out.yuv | |||||
stddev: 19.19 bytes:7602176 | |||||
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2 | 21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2 | ||||
116d1290ba1b4eb98fdee52e423417b1 *./data/out.wav | 116d1290ba1b4eb98fdee52e423417b1 *./data/out.wav | ||||
048b9c3444c788bac6ce5cc3a8f4db00 *./data/a-ac3.rm | 048b9c3444c788bac6ce5cc3a8f4db00 *./data/a-ac3.rm |
@@ -45,6 +45,7 @@ else | |||||
do_rc=y | do_rc=y | ||||
do_mpeg4adv=y | do_mpeg4adv=y | ||||
do_mpeg1b=y | do_mpeg1b=y | ||||
do_asv1=y | |||||
fi | fi | ||||
@@ -253,6 +254,16 @@ do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an $file | |||||
do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst | do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst | ||||
fi | fi | ||||
################################### | |||||
if [ -n "$do_asv1" ] ; then | |||||
# asv1 encoding | |||||
file=${outfile}asv1.avi | |||||
do_ffmpeg $file -y -qscale 10 -f pgmyuv -i $raw_src -an -vcodec asv1 $file | |||||
# asv1 decoding | |||||
do_ffmpeg $raw_dst -y -i $file -f rawvideo $raw_dst | |||||
fi | |||||
################################### | ################################### | ||||
if [ -n "$do_mp2" ] ; then | if [ -n "$do_mp2" ] ; then | ||||
# mp2 encoding | # mp2 encoding | ||||
@@ -41,6 +41,9 @@ stddev: 4.76 bytes:7602176 | |||||
1b46671251277c14f3a24a034648c458 *./data/a-rv10.rm | 1b46671251277c14f3a24a034648c458 *./data/a-rv10.rm | ||||
e1923bc2940a017858e354c3fb0e6244 *./data/out.yuv | e1923bc2940a017858e354c3fb0e6244 *./data/out.yuv | ||||
stddev: 13.18 bytes:7602176 | stddev: 13.18 bytes:7602176 | ||||
9c4f5a4613a5595c90c6b99bf143b6a9 *./data/a-asv1.avi | |||||
4251d7f496bbf362251b065e840a1b73 *./data/out.yuv | |||||
stddev: 9.80 bytes:7602176 | |||||
21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2 | 21f8ff9f1daacd9133683bb4ea0f50a4 *./data/a-mp2.mp2 | ||||
116d1290ba1b4eb98fdee52e423417b1 *./data/out.wav | 116d1290ba1b4eb98fdee52e423417b1 *./data/out.wav | ||||
048b9c3444c788bac6ce5cc3a8f4db00 *./data/a-ac3.rm | 048b9c3444c788bac6ce5cc3a8f4db00 *./data/a-ac3.rm |