Reviewed-by: tomas.hardin@codemill.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n2.6
@@ -2450,6 +2450,7 @@ mp4_muxer_select="mov_muxer" | |||||
mpegts_muxer_select="adts_muxer latm_muxer" | mpegts_muxer_select="adts_muxer latm_muxer" | ||||
mpegtsraw_demuxer_select="mpegts_demuxer" | mpegtsraw_demuxer_select="mpegts_demuxer" | ||||
mxf_d10_muxer_select="mxf_muxer" | mxf_d10_muxer_select="mxf_muxer" | ||||
mxf_opatom_muxer_select="mxf_muxer" | |||||
nut_muxer_select="riffenc" | nut_muxer_select="riffenc" | ||||
nuv_demuxer_select="riffdec" | nuv_demuxer_select="riffdec" | ||||
oga_muxer_select="ogg_muxer" | oga_muxer_select="ogg_muxer" | ||||
@@ -22,6 +22,7 @@ FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg | |||||
FATE_LAVF-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += mulaw | 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) += mxf | ||||
FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10 | FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10 | ||||
FATE_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom | |||||
FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut | FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut | ||||
FATE_LAVF-$(call ENCDEC, FLAC, OGG) += ogg | FATE_LAVF-$(call ENCDEC, FLAC, OGG) += ogg | ||||
FATE_LAVF-$(call ENCDEC, PAM, IMAGE2) += pam | FATE_LAVF-$(call ENCDEC, PAM, IMAGE2) += pam | ||||
@@ -178,6 +178,7 @@ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, MPEG1SYSTEM MPEGPS) += mpg | |||||
FATE_SEEK_LAVF-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += mulaw | 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) += mxf | ||||
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10 | FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10 | ||||
FATE_SEEK_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom | |||||
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut | FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut | ||||
FATE_SEEK_LAVF-$(call ENCDEC, FLAC, OGG) += ogg | FATE_SEEK_LAVF-$(call ENCDEC, FLAC, OGG) += ogg | ||||
FATE_SEEK_LAVF-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe | FATE_SEEK_LAVF-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe | ||||
@@ -216,6 +217,7 @@ fate-seek-lavf-mpg: SRC = lavf/lavf.mpg | |||||
fate-seek-lavf-mulaw: SRC = lavf/lavf.ul | fate-seek-lavf-mulaw: SRC = lavf/lavf.ul | ||||
fate-seek-lavf-mxf: SRC = lavf/lavf.mxf | fate-seek-lavf-mxf: SRC = lavf/lavf.mxf | ||||
fate-seek-lavf-mxf_d10: SRC = lavf/lavf.mxf_d10 | fate-seek-lavf-mxf_d10: SRC = lavf/lavf.mxf_d10 | ||||
fate-seek-lavf-mxf_opatom: SRC = lavf/lavf.mxf_opatom | |||||
fate-seek-lavf-nut: SRC = lavf/lavf.nut | fate-seek-lavf-nut: SRC = lavf/lavf.nut | ||||
fate-seek-lavf-ogg: SRC = lavf/lavf.ogg | fate-seek-lavf-ogg: SRC = lavf/lavf.ogg | ||||
fate-seek-lavf-pbmpipe: SRC = lavf/pbmpipe.pbm | fate-seek-lavf-pbmpipe: SRC = lavf/pbmpipe.pbm | ||||
@@ -90,6 +90,10 @@ 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" | 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 | 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 | |||||
if [ -n "$do_ts" ] ; then | if [ -n "$do_ts" ] ; then | ||||
do_lavf ts "" "-ab 64k -mpegts_transport_stream_id 42 -ar 44100 -threads 1" | do_lavf ts "" "-ab 64k -mpegts_transport_stream_id 42 -ar 44100 -threads 1" | ||||
fi | fi | ||||
@@ -0,0 +1,3 @@ | |||||
8b312335b1af76e0133092c2658cd4a4 *./tests/data/lavf/lavf.mxf_opatom | |||||
4716601 ./tests/data/lavf/lavf.mxf_opatom | |||||
./tests/data/lavf/lavf.mxf_opatom CRC=0xbdd696b9 |
@@ -0,0 +1,53 @@ | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416 | |||||
ret: 0 st:-1 flags:0 ts:-1.000000 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416 | |||||
ret: 0 st:-1 flags:1 ts: 1.894167 | |||||
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416 | |||||
ret: 0 st: 0 flags:0 ts: 0.800000 | |||||
ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3772953 size:188416 | |||||
ret: 0 st: 0 flags:1 ts:-0.320000 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416 | |||||
ret: 0 st:-1 flags:0 ts: 2.576668 | |||||
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416 | |||||
ret: 0 st:-1 flags:1 ts: 1.470835 | |||||
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416 | |||||
ret: 0 st: 0 flags:0 ts: 0.360000 | |||||
ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1700377 size:188416 | |||||
ret: 0 st: 0 flags:1 ts:-0.760000 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416 | |||||
ret: 0 st:-1 flags:0 ts: 2.153336 | |||||
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416 | |||||
ret: 0 st:-1 flags:1 ts: 1.047503 | |||||
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416 | |||||
ret: 0 st: 0 flags:0 ts:-0.040000 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416 | |||||
ret: 0 st: 0 flags:1 ts: 2.840000 | |||||
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416 | |||||
ret: 0 st:-1 flags:0 ts: 1.730004 | |||||
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416 | |||||
ret: 0 st:-1 flags:1 ts: 0.624171 | |||||
ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:3019289 size:188416 | |||||
ret: 0 st: 0 flags:0 ts:-0.480000 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416 | |||||
ret: 0 st: 0 flags:1 ts: 2.400000 | |||||
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416 | |||||
ret: 0 st:-1 flags:0 ts: 1.306672 | |||||
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416 | |||||
ret: 0 st:-1 flags:1 ts: 0.200839 | |||||
ret: 0 st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 946713 size:188416 | |||||
ret: 0 st: 0 flags:0 ts:-0.920000 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416 | |||||
ret: 0 st: 0 flags:1 ts: 2.000000 | |||||
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416 | |||||
ret: 0 st:-1 flags:0 ts: 0.883340 | |||||
ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:4149785 size:188416 | |||||
ret: 0 st:-1 flags:1 ts:-0.222493 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416 | |||||
ret: 0 st: 0 flags:0 ts: 2.680000 | |||||
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416 | |||||
ret: 0 st: 0 flags:1 ts: 1.560000 | |||||
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4526617 size:188416 | |||||
ret: 0 st:-1 flags:0 ts: 0.460008 | |||||
ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:2265625 size:188416 | |||||
ret: 0 st:-1 flags:1 ts:-0.645825 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 4633 size:188416 |