Re: [FFmpeg-devel] [PATCH 2/2] fate: add mxf_dv25/dvcpro50 regression tests
2017-09-20 0:56 GMT+02:00 Mark Thompson : > Ignore this: I was caught out by the shared libraries using an > installed copy of the same version without the relevant fix for > testing. Indicating the commit was missing a micro bump. Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 2/2] fate: add mxf_dv25/dvcpro50 regression tests
On 19/09/17 23:24, Mark Thompson wrote: > On 19/09/17 23:13, Mark Thompson wrote: >> On 18/09/17 08:34, Tobias Rapp wrote: >>> On 15.09.2017 22:43, Michael Niedermayer wrote: On Thu, Sep 14, 2017 at 03:44:42PM +0200, Tobias Rapp wrote: > Signed-off-by: Tobias Rapp > --- > tests/fate/avformat.mak | 2 ++ > tests/fate/seek.mak | 4 +++ > tests/lavf-regression.sh | 8 ++ > tests/ref/lavf/mxf_dv25 | 3 +++ > tests/ref/lavf/mxf_dvcpro50 | 3 +++ > tests/ref/seek/lavf-mxf_dv25 | 53 > > tests/ref/seek/lavf-mxf_dvcpro50 | 53 > > 7 files changed, 126 insertions(+) > create mode 100644 tests/ref/lavf/mxf_dv25 > create mode 100644 tests/ref/lavf/mxf_dvcpro50 > create mode 100644 tests/ref/seek/lavf-mxf_dv25 > create mode 100644 tests/ref/seek/lavf-mxf_dvcpro50 probably ok >>> >>> Applied, thanks for the review. >>> >>> Tobias >> >> Could this contain some system-dependence or nondeterminism? >> >> (Debian stable, Skylake x86-64, nothing funny going on that I'm aware of...) >> >> >> $ make V=1 fate-lavf-mxf_dvcpro50 >> TESTlavf-mxf_dvcpro50 >> /home/mrt/video/ffmpeg/push/tests/fate-run.sh fate-lavf-mxf_dvcpro50 >> "/home/mrt/video/ffmpeg/fate/" "" "/home/mrt/video/ffmpeg/push/build" >> 'lavftest' '' '' '' '1' '' '' '' '' '' '' '' '' '' >> /home/mrt/video/ffmpeg/push/build/ffmpeg -nostdin -nostats -y -cpuflags all >> -flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags >> +bitexact -threads 1 -f image2 -vcodec pgmyuv -i >> /home/mrt/video/ffmpeg/push/build/tests/vsynth1/%02d.pgm -flags +bitexact >> -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact -threads 1 >> -ar 44100 -f s16le -ar 48000 -ac 2 -i >> /home/mrt/video/ffmpeg/push/build/./tests/data/asynth1.sw -flags +bitexact >> -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact -threads 1 >> -dct fastint -metadata title=lavftest -b:a 64k -t 1 -qscale:v 10 -r 25 -vf >> scale=720:576,setdar=16/9 -vcodec dvvideo -pix_fmt yuv422p -b 5k -top 0 >> -f mxf /home/mrt/video/ffmpeg/push/build/./tests/data/lavf/lavf.mxf_dvcpro50 >> /home/mrt/video/ffmpeg/push/build/ffmpeg -nostdin -nostats -y -cpuflags all >> -flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags >> +bitexact -threads 1 -i >> /home/mrt/video/ffmpeg/push/build/./tests/data/lavf/lavf.mxf_dvcpro50 -f crc >> /home/mrt/video/ffmpeg/push/build/./tests/data/mxf_dvcpro50.lavf.crc >> --- /home/mrt/video/ffmpeg/push/tests/ref/lavf/mxf_dvcpro50 2017-09-19 >> 22:46:36.169691617 +0100 >> +++ tests/data/fate/lavf-mxf_dvcpro50 2017-09-19 23:07:20.558751142 +0100 >> @@ -1,3 +1,3 @@ >> -6c9cb62911ac16c3b55f0ad0b052c05b *./tests/data/lavf/lavf.mxf_dvcpro50 >> +fe3f278b4deed2b89eba6f31cb092f98 *./tests/data/lavf/lavf.mxf_dvcpro50 >> 7430189 ./tests/data/lavf/lavf.mxf_dvcpro50 >> ./tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4 >> Test lavf-mxf_dvcpro50 failed. Look at tests/data/fate/lavf-mxf_dvcpro50.err >> for details. >> ffmpeg version N-87333-gf952edaa73 Copyright (c) 2000-2017 the FFmpeg >> developers >> built with gcc 6.3.0 (Debian 6.3.0-18) 20170516 >> configuration: --samples=/home/mrt/video/ffmpeg/fate/ --enable-vaapi >> --enable-libdrm --enable-gpl --enable-libx264 --enable-shared >> libavutil 55. 75.100 / 55. 75.100 >> libavcodec 57.106.101 / 57.106.101 >> libavformat57. 82.100 / 57. 82.100 >> libavdevice57. 8.101 / 57. 8.101 >> libavfilter 6.105.100 / 6.105.100 >> libswscale 4. 7.103 / 4. 7.103 >> libswresample 2. 8.100 / 2. 8.100 >> libpostproc54. 6.100 / 54. 6.100 >> Input #0, image2, from >> '/home/mrt/video/ffmpeg/push/build/tests/vsynth1/%02d.pgm': >> Duration: 00:00:02.00, start: 0.00, bitrate: N/A >> Stream #0:0: Video: pgmyuv, yuv420p, 352x288, 25 fps, 25 tbr, 25 tbn, 25 >> tbc >> [s16le @ 0x5627ce70f2e0] Estimating duration from bitrate, this may be >> inaccurate >> Guessed Channel Layout for Input Stream #1.0 : stereo >> Input #1, s16le, from >> '/home/mrt/video/ffmpeg/push/build/./tests/data/asynth1.sw': >> Duration: 00:00:05.51, bitrate: 1536 kb/s >> Stream #1:0: Audio: pcm_s16le, 48000 Hz, stereo, s16, 1536 kb/s >> Codec AVOption idct (select IDCT implementation) specified for input file #1 >> (/home/mrt/video/ffmpeg/push/build/./tests/data/asynth1.sw) has not been >> used for any stream. The most likely reason is either wrong type (e.g. a >> video option with no video streams) or that it is a private option of some >> decoder which was not actually used for any stream. >> Please use -b:a or -b:v, -b is ambiguous >> Stream mapping: >> Stream #0:0 -> #0:0 (pgmyuv (native) -> dvvideo (native)) >> Stream #1:0 -> #0:1 (pcm_s16le (native) -> pcm_s16le (native)) >> [image2 @ 0x5627ce6f6fa
Re: [FFmpeg-devel] [PATCH 2/2] fate: add mxf_dv25/dvcpro50 regression tests
On 19/09/17 23:13, Mark Thompson wrote: > On 18/09/17 08:34, Tobias Rapp wrote: >> On 15.09.2017 22:43, Michael Niedermayer wrote: >>> On Thu, Sep 14, 2017 at 03:44:42PM +0200, Tobias Rapp wrote: Signed-off-by: Tobias Rapp --- tests/fate/avformat.mak | 2 ++ tests/fate/seek.mak | 4 +++ tests/lavf-regression.sh | 8 ++ tests/ref/lavf/mxf_dv25 | 3 +++ tests/ref/lavf/mxf_dvcpro50 | 3 +++ tests/ref/seek/lavf-mxf_dv25 | 53 tests/ref/seek/lavf-mxf_dvcpro50 | 53 7 files changed, 126 insertions(+) create mode 100644 tests/ref/lavf/mxf_dv25 create mode 100644 tests/ref/lavf/mxf_dvcpro50 create mode 100644 tests/ref/seek/lavf-mxf_dv25 create mode 100644 tests/ref/seek/lavf-mxf_dvcpro50 >>> >>> probably ok >> >> Applied, thanks for the review. >> >> Tobias > > Could this contain some system-dependence or nondeterminism? > > (Debian stable, Skylake x86-64, nothing funny going on that I'm aware of...) > > > $ make V=1 fate-lavf-mxf_dvcpro50 > TESTlavf-mxf_dvcpro50 > /home/mrt/video/ffmpeg/push/tests/fate-run.sh fate-lavf-mxf_dvcpro50 > "/home/mrt/video/ffmpeg/fate/" "" "/home/mrt/video/ffmpeg/push/build" > 'lavftest' '' '' '' '1' '' '' '' '' '' '' '' '' '' > /home/mrt/video/ffmpeg/push/build/ffmpeg -nostdin -nostats -y -cpuflags all > -flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags > +bitexact -threads 1 -f image2 -vcodec pgmyuv -i > /home/mrt/video/ffmpeg/push/build/tests/vsynth1/%02d.pgm -flags +bitexact > -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact -threads 1 > -ar 44100 -f s16le -ar 48000 -ac 2 -i > /home/mrt/video/ffmpeg/push/build/./tests/data/asynth1.sw -flags +bitexact > -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact -threads 1 > -dct fastint -metadata title=lavftest -b:a 64k -t 1 -qscale:v 10 -r 25 -vf > scale=720:576,setdar=16/9 -vcodec dvvideo -pix_fmt yuv422p -b 5k -top 0 > -f mxf /home/mrt/video/ffmpeg/push/build/./tests/data/lavf/lavf.mxf_dvcpro50 > /home/mrt/video/ffmpeg/push/build/ffmpeg -nostdin -nostats -y -cpuflags all > -flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags > +bitexact -threads 1 -i > /home/mrt/video/ffmpeg/push/build/./tests/data/lavf/lavf.mxf_dvcpro50 -f crc > /home/mrt/video/ffmpeg/push/build/./tests/data/mxf_dvcpro50.lavf.crc > --- /home/mrt/video/ffmpeg/push/tests/ref/lavf/mxf_dvcpro50 2017-09-19 > 22:46:36.169691617 +0100 > +++ tests/data/fate/lavf-mxf_dvcpro50 2017-09-19 23:07:20.558751142 +0100 > @@ -1,3 +1,3 @@ > -6c9cb62911ac16c3b55f0ad0b052c05b *./tests/data/lavf/lavf.mxf_dvcpro50 > +fe3f278b4deed2b89eba6f31cb092f98 *./tests/data/lavf/lavf.mxf_dvcpro50 > 7430189 ./tests/data/lavf/lavf.mxf_dvcpro50 > ./tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4 > Test lavf-mxf_dvcpro50 failed. Look at tests/data/fate/lavf-mxf_dvcpro50.err > for details. > ffmpeg version N-87333-gf952edaa73 Copyright (c) 2000-2017 the FFmpeg > developers > built with gcc 6.3.0 (Debian 6.3.0-18) 20170516 > configuration: --samples=/home/mrt/video/ffmpeg/fate/ --enable-vaapi > --enable-libdrm --enable-gpl --enable-libx264 --enable-shared > libavutil 55. 75.100 / 55. 75.100 > libavcodec 57.106.101 / 57.106.101 > libavformat57. 82.100 / 57. 82.100 > libavdevice57. 8.101 / 57. 8.101 > libavfilter 6.105.100 / 6.105.100 > libswscale 4. 7.103 / 4. 7.103 > libswresample 2. 8.100 / 2. 8.100 > libpostproc54. 6.100 / 54. 6.100 > Input #0, image2, from > '/home/mrt/video/ffmpeg/push/build/tests/vsynth1/%02d.pgm': > Duration: 00:00:02.00, start: 0.00, bitrate: N/A > Stream #0:0: Video: pgmyuv, yuv420p, 352x288, 25 fps, 25 tbr, 25 tbn, 25 > tbc > [s16le @ 0x5627ce70f2e0] Estimating duration from bitrate, this may be > inaccurate > Guessed Channel Layout for Input Stream #1.0 : stereo > Input #1, s16le, from > '/home/mrt/video/ffmpeg/push/build/./tests/data/asynth1.sw': > Duration: 00:00:05.51, bitrate: 1536 kb/s > Stream #1:0: Audio: pcm_s16le, 48000 Hz, stereo, s16, 1536 kb/s > Codec AVOption idct (select IDCT implementation) specified for input file #1 > (/home/mrt/video/ffmpeg/push/build/./tests/data/asynth1.sw) has not been used > for any stream. The most likely reason is either wrong type (e.g. a video > option with no video streams) or that it is a private option of some decoder > which was not actually used for any stream. > Please use -b:a or -b:v, -b is ambiguous > Stream mapping: > Stream #0:0 -> #0:0 (pgmyuv (native) -> dvvideo (native)) > Stream #1:0 -> #0:1 (pcm_s16le (native) -> pcm_s16le (native)) > [image2 @ 0x5627ce6f6fa0] Thread message queue blocking; consider raising the > thread_queue_size option (current value: 8) > Output #0, mxf, to > '/home/mr
Re: [FFmpeg-devel] [PATCH 2/2] fate: add mxf_dv25/dvcpro50 regression tests
On 18/09/17 08:34, Tobias Rapp wrote: > On 15.09.2017 22:43, Michael Niedermayer wrote: >> On Thu, Sep 14, 2017 at 03:44:42PM +0200, Tobias Rapp wrote: >>> Signed-off-by: Tobias Rapp >>> --- >>> tests/fate/avformat.mak | 2 ++ >>> tests/fate/seek.mak | 4 +++ >>> tests/lavf-regression.sh | 8 ++ >>> tests/ref/lavf/mxf_dv25 | 3 +++ >>> tests/ref/lavf/mxf_dvcpro50 | 3 +++ >>> tests/ref/seek/lavf-mxf_dv25 | 53 >>> >>> tests/ref/seek/lavf-mxf_dvcpro50 | 53 >>> >>> 7 files changed, 126 insertions(+) >>> create mode 100644 tests/ref/lavf/mxf_dv25 >>> create mode 100644 tests/ref/lavf/mxf_dvcpro50 >>> create mode 100644 tests/ref/seek/lavf-mxf_dv25 >>> create mode 100644 tests/ref/seek/lavf-mxf_dvcpro50 >> >> probably ok > > Applied, thanks for the review. > > Tobias Could this contain some system-dependence or nondeterminism? (Debian stable, Skylake x86-64, nothing funny going on that I'm aware of...) $ make V=1 fate-lavf-mxf_dvcpro50 TESTlavf-mxf_dvcpro50 /home/mrt/video/ffmpeg/push/tests/fate-run.sh fate-lavf-mxf_dvcpro50 "/home/mrt/video/ffmpeg/fate/" "" "/home/mrt/video/ffmpeg/push/build" 'lavftest' '' '' '' '1' '' '' '' '' '' '' '' '' '' /home/mrt/video/ffmpeg/push/build/ffmpeg -nostdin -nostats -y -cpuflags all -flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact -threads 1 -f image2 -vcodec pgmyuv -i /home/mrt/video/ffmpeg/push/build/tests/vsynth1/%02d.pgm -flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact -threads 1 -ar 44100 -f s16le -ar 48000 -ac 2 -i /home/mrt/video/ffmpeg/push/build/./tests/data/asynth1.sw -flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact -threads 1 -dct fastint -metadata title=lavftest -b:a 64k -t 1 -qscale:v 10 -r 25 -vf scale=720:576,setdar=16/9 -vcodec dvvideo -pix_fmt yuv422p -b 5k -top 0 -f mxf /home/mrt/video/ffmpeg/push/build/./tests/data/lavf/lavf.mxf_dvcpro50 /home/mrt/video/ffmpeg/push/build/ffmpeg -nostdin -nostats -y -cpuflags all -flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact -threads 1 -i /home/mrt/video/ffmpeg/push/build/./tests/data/lavf/lavf.mxf_dvcpro50 -f crc /home/mrt/video/ffmpeg/push/build/./tests/data/mxf_dvcpro50.lavf.crc --- /home/mrt/video/ffmpeg/push/tests/ref/lavf/mxf_dvcpro50 2017-09-19 22:46:36.169691617 +0100 +++ tests/data/fate/lavf-mxf_dvcpro50 2017-09-19 23:07:20.558751142 +0100 @@ -1,3 +1,3 @@ -6c9cb62911ac16c3b55f0ad0b052c05b *./tests/data/lavf/lavf.mxf_dvcpro50 +fe3f278b4deed2b89eba6f31cb092f98 *./tests/data/lavf/lavf.mxf_dvcpro50 7430189 ./tests/data/lavf/lavf.mxf_dvcpro50 ./tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4 Test lavf-mxf_dvcpro50 failed. Look at tests/data/fate/lavf-mxf_dvcpro50.err for details. ffmpeg version N-87333-gf952edaa73 Copyright (c) 2000-2017 the FFmpeg developers built with gcc 6.3.0 (Debian 6.3.0-18) 20170516 configuration: --samples=/home/mrt/video/ffmpeg/fate/ --enable-vaapi --enable-libdrm --enable-gpl --enable-libx264 --enable-shared libavutil 55. 75.100 / 55. 75.100 libavcodec 57.106.101 / 57.106.101 libavformat57. 82.100 / 57. 82.100 libavdevice57. 8.101 / 57. 8.101 libavfilter 6.105.100 / 6.105.100 libswscale 4. 7.103 / 4. 7.103 libswresample 2. 8.100 / 2. 8.100 libpostproc54. 6.100 / 54. 6.100 Input #0, image2, from '/home/mrt/video/ffmpeg/push/build/tests/vsynth1/%02d.pgm': Duration: 00:00:02.00, start: 0.00, bitrate: N/A Stream #0:0: Video: pgmyuv, yuv420p, 352x288, 25 fps, 25 tbr, 25 tbn, 25 tbc [s16le @ 0x5627ce70f2e0] Estimating duration from bitrate, this may be inaccurate Guessed Channel Layout for Input Stream #1.0 : stereo Input #1, s16le, from '/home/mrt/video/ffmpeg/push/build/./tests/data/asynth1.sw': Duration: 00:00:05.51, bitrate: 1536 kb/s Stream #1:0: Audio: pcm_s16le, 48000 Hz, stereo, s16, 1536 kb/s Codec AVOption idct (select IDCT implementation) specified for input file #1 (/home/mrt/video/ffmpeg/push/build/./tests/data/asynth1.sw) has not been used for any stream. The most likely reason is either wrong type (e.g. a video option with no video streams) or that it is a private option of some decoder which was not actually used for any stream. Please use -b:a or -b:v, -b is ambiguous Stream mapping: Stream #0:0 -> #0:0 (pgmyuv (native) -> dvvideo (native)) Stream #1:0 -> #0:1 (pcm_s16le (native) -> pcm_s16le (native)) [image2 @ 0x5627ce6f6fa0] Thread message queue blocking; consider raising the thread_queue_size option (current value: 8) Output #0, mxf, to '/home/mrt/video/ffmpeg/push/build/./tests/data/lavf/lavf.mxf_dvcpro50': Metadata: title : lavftest Stream #0:0: Video: dvvideo, yuv422p(progressive), 720x576 [SAR 64:45 DAR 16:9], q=2-31, 5 kb/s, 25
Re: [FFmpeg-devel] [PATCH 2/2] fate: add mxf_dv25/dvcpro50 regression tests
On 15.09.2017 22:43, Michael Niedermayer wrote: On Thu, Sep 14, 2017 at 03:44:42PM +0200, Tobias Rapp wrote: Signed-off-by: Tobias Rapp --- tests/fate/avformat.mak | 2 ++ tests/fate/seek.mak | 4 +++ tests/lavf-regression.sh | 8 ++ tests/ref/lavf/mxf_dv25 | 3 +++ tests/ref/lavf/mxf_dvcpro50 | 3 +++ tests/ref/seek/lavf-mxf_dv25 | 53 tests/ref/seek/lavf-mxf_dvcpro50 | 53 7 files changed, 126 insertions(+) create mode 100644 tests/ref/lavf/mxf_dv25 create mode 100644 tests/ref/lavf/mxf_dvcpro50 create mode 100644 tests/ref/seek/lavf-mxf_dv25 create mode 100644 tests/ref/seek/lavf-mxf_dvcpro50 probably ok Applied, thanks for the review. Tobias ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 2/2] fate: add mxf_dv25/dvcpro50 regression tests
On Thu, Sep 14, 2017 at 03:44:42PM +0200, Tobias Rapp wrote: > Signed-off-by: Tobias Rapp > --- > tests/fate/avformat.mak | 2 ++ > tests/fate/seek.mak | 4 +++ > tests/lavf-regression.sh | 8 ++ > tests/ref/lavf/mxf_dv25 | 3 +++ > tests/ref/lavf/mxf_dvcpro50 | 3 +++ > tests/ref/seek/lavf-mxf_dv25 | 53 > > tests/ref/seek/lavf-mxf_dvcpro50 | 53 > > 7 files changed, 126 insertions(+) > create mode 100644 tests/ref/lavf/mxf_dv25 > create mode 100644 tests/ref/lavf/mxf_dvcpro50 > create mode 100644 tests/ref/seek/lavf-mxf_dv25 > create mode 100644 tests/ref/seek/lavf-mxf_dvcpro50 probably ok [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Those who would give up essential Liberty, to purchase a little temporary Safety, deserve neither Liberty nor Safety -- Benjamin Franklin signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 2/2] fate: add mxf_dv25/dvcpro50 regression tests
Signed-off-by: Tobias Rapp --- tests/fate/avformat.mak | 2 ++ tests/fate/seek.mak | 4 +++ tests/lavf-regression.sh | 8 ++ tests/ref/lavf/mxf_dv25 | 3 +++ tests/ref/lavf/mxf_dvcpro50 | 3 +++ tests/ref/seek/lavf-mxf_dv25 | 53 tests/ref/seek/lavf-mxf_dvcpro50 | 53 7 files changed, 126 insertions(+) create mode 100644 tests/ref/lavf/mxf_dv25 create mode 100644 tests/ref/lavf/mxf_dvcpro50 create mode 100644 tests/ref/seek/lavf-mxf_dv25 create mode 100644 tests/ref/seek/lavf-mxf_dvcpro50 diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak index f65ef76..c9ea99a 100644 --- a/tests/fate/avformat.mak +++ b/tests/fate/avformat.mak @@ -25,6 +25,8 @@ FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg FATE_LAVF-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += mulaw FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)+= mxf FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF)+= mxf_d10 +FATE_LAVF-$(call ENCDEC2, DVVIDEO,PCM_S16LE, MXF)+= mxf_dv25 +FATE_LAVF-$(call ENCDEC2, DVVIDEO,PCM_S16LE, MXF)+= mxf_dvcpro50 FATE_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom FATE_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT)+= nut diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak index 1a6e584..c863b2a 100644 --- a/tests/fate/seek.mak +++ b/tests/fate/seek.mak @@ -180,6 +180,8 @@ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg FATE_SEEK_LAVF-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += mulaw FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10 +FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO,PCM_S16LE, MXF) += mxf_dv25 +FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO,PCM_S16LE, MXF) += mxf_dvcpro50 FATE_SEEK_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom FATE_SEEK_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut @@ -220,6 +222,8 @@ fate-seek-lavf-mpg: SRC = lavf/lavf.mpg fate-seek-lavf-mulaw:SRC = lavf/lavf.ul fate-seek-lavf-mxf: SRC = lavf/lavf.mxf fate-seek-lavf-mxf_d10: SRC = lavf/lavf.mxf_d10 +fate-seek-lavf-mxf_dv25: SRC = lavf/lavf.mxf_dv25 +fate-seek-lavf-mxf_dvcpro50: SRC = lavf/lavf.mxf_dvcpro50 fate-seek-lavf-mxf_opatom: SRC = lavf/lavf.mxf_opatom fate-seek-lavf-mxf_opatom_audio: SRC = lavf/lavf.mxf_opatom_audio fate-seek-lavf-nut: SRC = lavf/lavf.nut diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index d9026de..45c877e 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -90,6 +90,14 @@ if [ -n "$do_mxf_d10" ]; then do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -vcodec mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 3k -maxrate 3k -b 3k -bufsize 120 -top 1 -rc_init_occupancy 120 -qmax 12 -f mxf_d10" fi +if [ -n "$do_mxf_dv25" ]; then +do_lavf mxf_dv25 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=4/3 -vcodec dvvideo -pix_fmt yuv420p -b 25000k -top 0 -f mxf" +fi + +if [ -n "$do_mxf_dvcpro50" ]; then +do_lavf mxf_dvcpro50 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=16/9 -vcodec dvvideo -pix_fmt yuv422p -b 5k -top 0 -f mxf" +fi + if [ -n "$do_mxf_opatom" ]; then do_lavf mxf_opatom "" "-s 1920x1080 -vcodec dnxhd -pix_fmt yuv422p -vb 36M -f mxf_opatom -map 0" fi diff --git a/tests/ref/lavf/mxf_dv25 b/tests/ref/lavf/mxf_dv25 new file mode 100644 index 000..adecc07 --- /dev/null +++ b/tests/ref/lavf/mxf_dv25 @@ -0,0 +1,3 @@ +de98603ecc27c2f3cefd192d4820d3f4 *./tests/data/lavf/lavf.mxf_dv25 +3833389 ./tests/data/lavf/lavf.mxf_dv25 +./tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52 diff --git a/tests/ref/lavf/mxf_dvcpro50 b/tests/ref/lavf/mxf_dvcpro50 new file mode 100644 index 000..1d0cf79 --- /dev/null +++ b/tests/ref/lavf/mxf_dvcpro50 @@ -0,0 +1,3 @@ +6c9cb62911ac16c3b55f0ad0b052c05b *./tests/data/lavf/lavf.mxf_dvcpro50 +7430189 ./tests/data/lavf/lavf.mxf_dvcpro50 +./tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4 diff --git a/tests/ref/seek/lavf-mxf_dv25 b/tests/ref/seek/lavf-mxf_dv25 new file mode 100644 index 000..42b3bbd --- /dev/null +++ b/tests/ref/seek/lavf-mxf_dv25 @@ -0,0 +1,53 @@ +ret: 0 st: 0 flags:1 dts: 0.00 pts: 0.00 pos: 6144 size:144000 +ret: 0 st:-1 flags:0 ts:-1.00 +ret: 0 st: 0 flags:1 dts: 0.00