Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>tags/n3.4
| @@ -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 | |||
| @@ -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 | |||
| @@ -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 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -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 50000k -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 | |||
| @@ -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 | |||
| @@ -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 | |||
| @@ -0,0 +1,53 @@ | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:144000 | |||
| ret: 0 st:-1 flags:0 ts:-1.000000 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:144000 | |||
| ret: 0 st:-1 flags:1 ts: 1.894167 | |||
| ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680256 size:144000 | |||
| ret: 0 st: 0 flags:0 ts: 0.800000 | |||
| ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3067904 size:144000 | |||
| ret: 0 st: 0 flags:1 ts:-0.320000 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:144000 | |||
| ret: 0 st: 1 flags:0 ts: 2.576667 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680256 size:144000 | |||
| ret: 0 st: 1 flags:1 ts: 1.470833 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680256 size:144000 | |||
| ret: 0 st:-1 flags:0 ts: 0.365002 | |||
| ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1383936 size:144000 | |||
| ret: 0 st:-1 flags:1 ts:-0.740831 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:144000 | |||
| ret: 0 st: 0 flags:0 ts: 2.160000 | |||
| ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680256 size:144000 | |||
| ret: 0 st: 0 flags:1 ts: 1.040000 | |||
| ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680256 size:144000 | |||
| ret: 0 st: 1 flags:0 ts:-0.058333 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:144000 | |||
| ret: 0 st: 1 flags:1 ts: 2.835833 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680256 size:144000 | |||
| ret: 0 st:-1 flags:0 ts: 1.730004 | |||
| ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680256 size:144000 | |||
| ret: 0 st:-1 flags:1 ts: 0.624171 | |||
| ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2455552 size:144000 | |||
| ret: 0 st: 0 flags:0 ts:-0.480000 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:144000 | |||
| ret: 0 st: 0 flags:1 ts: 2.400000 | |||
| ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680256 size:144000 | |||
| ret: 0 st: 1 flags:0 ts: 1.306667 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680256 size:144000 | |||
| ret: 0 st: 1 flags:1 ts: 0.200833 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 771584 size:144000 | |||
| ret: 0 st:-1 flags:0 ts:-0.904994 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:144000 | |||
| ret: 0 st:-1 flags:1 ts: 1.989173 | |||
| ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680256 size:144000 | |||
| ret: 0 st: 0 flags:0 ts: 0.880000 | |||
| ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3374080 size:144000 | |||
| ret: 0 st: 0 flags:1 ts:-0.240000 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:144000 | |||
| ret: 0 st: 1 flags:0 ts: 2.671667 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680256 size:144000 | |||
| ret: 0 st: 1 flags:1 ts: 1.565833 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680256 size:144000 | |||
| ret: 0 st:-1 flags:0 ts: 0.460008 | |||
| ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1843200 size:144000 | |||
| ret: 0 st:-1 flags:1 ts:-0.645825 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:144000 | |||
| @@ -0,0 +1,53 @@ | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:288000 | |||
| ret: 0 st:-1 flags:0 ts:-1.000000 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:288000 | |||
| ret: 0 st:-1 flags:1 ts: 1.894167 | |||
| ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133184 size:288000 | |||
| ret: 0 st: 0 flags:0 ts: 0.800000 | |||
| ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:5945344 size:288000 | |||
| ret: 0 st: 0 flags:1 ts:-0.320000 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:288000 | |||
| ret: 0 st: 1 flags:0 ts: 2.576667 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133184 size:288000 | |||
| ret: 0 st: 1 flags:1 ts: 1.470833 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133184 size:288000 | |||
| ret: 0 st:-1 flags:0 ts: 0.365002 | |||
| ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:2678784 size:288000 | |||
| ret: 0 st:-1 flags:1 ts:-0.740831 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:288000 | |||
| ret: 0 st: 0 flags:0 ts: 2.160000 | |||
| ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133184 size:288000 | |||
| ret: 0 st: 0 flags:1 ts: 1.040000 | |||
| ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133184 size:288000 | |||
| ret: 0 st: 1 flags:0 ts:-0.058333 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:288000 | |||
| ret: 0 st: 1 flags:1 ts: 2.835833 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133184 size:288000 | |||
| ret: 0 st:-1 flags:0 ts: 1.730004 | |||
| ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133184 size:288000 | |||
| ret: 0 st:-1 flags:1 ts: 0.624171 | |||
| ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:4757504 size:288000 | |||
| ret: 0 st: 0 flags:0 ts:-0.480000 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:288000 | |||
| ret: 0 st: 0 flags:1 ts: 2.400000 | |||
| ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133184 size:288000 | |||
| ret: 0 st: 1 flags:0 ts: 1.306667 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133184 size:288000 | |||
| ret: 0 st: 1 flags:1 ts: 0.200833 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:1490944 size:288000 | |||
| ret: 0 st:-1 flags:0 ts:-0.904994 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:288000 | |||
| ret: 0 st:-1 flags:1 ts: 1.989173 | |||
| ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133184 size:288000 | |||
| ret: 0 st: 0 flags:0 ts: 0.880000 | |||
| ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:6539264 size:288000 | |||
| ret: 0 st: 0 flags:1 ts:-0.240000 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:288000 | |||
| ret: 0 st: 1 flags:0 ts: 2.671667 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133184 size:288000 | |||
| ret: 0 st: 1 flags:1 ts: 1.565833 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133184 size:288000 | |||
| ret: 0 st:-1 flags:0 ts: 0.460008 | |||
| ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:3569664 size:288000 | |||
| ret: 0 st:-1 flags:1 ts:-0.645825 | |||
| ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 6144 size:288000 | |||