diff options
author | James Almer <jamrial@gmail.com> | 2016-08-04 16:21:25 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2016-08-04 16:25:40 -0300 |
commit | 376d4b3c0d9d779baef3e2a72ac1ffe77e8508b8 (patch) | |
tree | f3ce1d9feb7f9f6f8352a9966722ef546fb03f06 /tests | |
parent | ce944e84892f1ba21602bd83b1a5d532dfdd1eda (diff) | |
download | ffmpeg-376d4b3c0d9d779baef3e2a72ac1ffe77e8508b8.tar.gz |
avformat: add a TTA Muxer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/fate/acodec.mak | 4 | ||||
-rw-r--r-- | tests/fate/avformat.mak | 2 | ||||
-rwxr-xr-x | tests/lavf-regression.sh | 8 | ||||
-rw-r--r-- | tests/ref/acodec/tta | 4 | ||||
-rw-r--r-- | tests/ref/lavf/mka | 3 | ||||
-rw-r--r-- | tests/ref/lavf/tta | 3 |
6 files changed, 20 insertions, 4 deletions
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak index e0f23208e2..c7d4d269cb 100644 --- a/tests/fate/acodec.mak +++ b/tests/fate/acodec.mak @@ -154,8 +154,8 @@ FATE_ACODEC-$(call ENCDEC, WAVPACK, WV) += fate-acodec-wavpack fate-acodec-wavpack: FMT = wv fate-acodec-wavpack: CODEC = wavpack -compression_level 1 -FATE_ACODEC-$(call ENCDEC, TTA, MATROSKA) += fate-acodec-tta -fate-acodec-tta: FMT = matroska +FATE_ACODEC-$(call ENCDEC, TTA, TTA) += fate-acodec-tta +fate-acodec-tta: FMT = tta FATE_ACODEC += $(FATE_ACODEC-yes) diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak index c7f3124bb9..3760e41457 100644 --- a/tests/fate/avformat.mak +++ b/tests/fate/avformat.mak @@ -15,6 +15,7 @@ FATE_LAVF-$(call ENCDEC, GIF, IMAGE2) += gif FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf FATE_LAVF-$(call ENCDEC, PCM_S16LE, IRCAM) += ircam FATE_LAVF-$(call ENCDEC, MJPEG, IMAGE2) += jpg +FATE_LAVF-$(call ENCMUX, TTA, MATROSKA_AUDIO) += mka FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, MATROSKA) += mkv FATE_LAVF-$(call ENCDEC, ADPCM_YAMAHA, MMF) += mmf FATE_LAVF-$(call ENCDEC2, MPEG4, PCM_ALAW, MOV) += mov ismv @@ -44,6 +45,7 @@ FATE_LAVF-$(call ENCDEC, FLV, SWF) += swf FATE_LAVF-$(call ENCDEC, TARGA, IMAGE2) += tga FATE_LAVF-$(call ENCDEC, TIFF, IMAGE2) += tiff FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts +FATE_LAVF-$(call ENCDEC, TTA, TTA) += tta FATE_LAVF-$(call ENCDEC, PCM_U8, VOC) += voc FATE_LAVF-$(call ENCDEC, PCM_S16LE, VOC) += voc_s16 FATE_LAVF-$(call ENCDEC, PCM_S16LE, WAV) += wav diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 0e20513563..8d961781d9 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -145,6 +145,10 @@ if [ -n "$do_nut" ] ; then do_lavf nut "" "-acodec mp2 -ab 64k -ar 44100 -threads 1" fi +if [ -n "$do_mka" ] ; then +do_audio_only mka "" "-c:a tta" +fi + if [ -n "$do_mkv" ] ; then do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 \ -attach ${raw_src%/*}/00.pgm -metadata:s:t mimetype=image/x-portable-greymap -threads 1" @@ -350,6 +354,10 @@ if [ -n "$do_sox" ] ; then do_audio_only sox fi +if [ -n "$do_tta" ] ; then +do_audio_only tta +fi + if [ -n "$do_caf" ] ; then do_audio_only caf fi diff --git a/tests/ref/acodec/tta b/tests/ref/acodec/tta index 0f60345679..8e183f9922 100644 --- a/tests/ref/acodec/tta +++ b/tests/ref/acodec/tta @@ -1,4 +1,4 @@ -6c260836d7a32e4bd714453a3546c0d5 *tests/data/fate/acodec-tta.matroska -331148 tests/data/fate/acodec-tta.matroska +847d065f082ac94825728b5f1af853eb *tests/data/fate/acodec-tta.tta +330583 tests/data/fate/acodec-tta.tta 95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-tta.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka new file mode 100644 index 0000000000..962b2542f9 --- /dev/null +++ b/tests/ref/lavf/mka @@ -0,0 +1,3 @@ +b2e3746787b885d0191a1a26f3faa58f *./tests/data/lavf/lavf.mka +43654 ./tests/data/lavf/lavf.mka +./tests/data/lavf/lavf.mka CRC=0x3a1da17e diff --git a/tests/ref/lavf/tta b/tests/ref/lavf/tta new file mode 100644 index 0000000000..745e8d21bd --- /dev/null +++ b/tests/ref/lavf/tta @@ -0,0 +1,3 @@ +f2721d06704ac43d89fdd25835b43598 *./tests/data/lavf/lavf.tta +43200 ./tests/data/lavf/lavf.tta +./tests/data/lavf/lavf.tta CRC=0x3a1da17e |