Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n2.7
@@ -23,6 +23,7 @@ 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, 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 | 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 | ||||
@@ -179,6 +179,7 @@ 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, 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 | 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 | ||||
@@ -218,6 +219,7 @@ 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-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 | 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 | ||||
@@ -94,6 +94,10 @@ if [ -n "$do_mxf_opatom" ]; then | |||||
do_lavf mxf_opatom "" "-s 1920x1080 -vcodec dnxhd -pix_fmt yuv422p -vb 36M -f mxf_opatom -map 0" | do_lavf mxf_opatom "" "-s 1920x1080 -vcodec dnxhd -pix_fmt yuv422p -vb 36M -f mxf_opatom -map 0" | ||||
fi | fi | ||||
if [ -n "$do_mxf_opatom_audio" ]; then | |||||
do_lavf mxf_opatom_audio "-ar 48000 -ac 1" "-f mxf_opatom -mxf_audio_edit_rate 25 -map 1" | |||||
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 @@ | |||||
77bd25ba3213ffbdc4d4c9052914510f *./tests/data/lavf/lavf.mxf_opatom_audio | |||||
102457 ./tests/data/lavf/lavf.mxf_opatom_audio | |||||
./tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff |
@@ -0,0 +1,53 @@ | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 | |||||
ret: 0 st:-1 flags:0 ts:-1.000000 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 | |||||
ret: 0 st:-1 flags:1 ts: 1.894167 | |||||
ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 | |||||
ret: 0 st: 0 flags:0 ts: 0.788333 | |||||
ret: 0 st: 0 flags:1 dts: 0.788333 pts: 0.788333 pos: 80825 size: 3840 | |||||
ret: 0 st: 0 flags:1 ts:-0.317500 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 | |||||
ret: 0 st:-1 flags:0 ts: 2.576668 | |||||
ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 | |||||
ret: 0 st:-1 flags:1 ts: 1.470835 | |||||
ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 | |||||
ret: 0 st: 0 flags:0 ts: 0.365000 | |||||
ret: 0 st: 0 flags:1 dts: 0.365000 pts: 0.365000 pos: 40185 size: 3840 | |||||
ret: 0 st: 0 flags:1 ts:-0.740833 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 | |||||
ret: 0 st:-1 flags:0 ts: 2.153336 | |||||
ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 | |||||
ret: 0 st:-1 flags:1 ts: 1.047503 | |||||
ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 | |||||
ret: 0 st: 0 flags:0 ts:-0.058333 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 | |||||
ret: 0 st: 0 flags:1 ts: 2.835833 | |||||
ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 | |||||
ret: 0 st:-1 flags:0 ts: 1.730004 | |||||
ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 | |||||
ret: 0 st:-1 flags:1 ts: 0.624171 | |||||
ret: 0 st: 0 flags:1 dts: 0.624167 pts: 0.624167 pos: 65065 size: 3840 | |||||
ret: 0 st: 0 flags:0 ts:-0.481667 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 | |||||
ret: 0 st: 0 flags:1 ts: 2.412500 | |||||
ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 | |||||
ret: 0 st:-1 flags:0 ts: 1.306672 | |||||
ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 | |||||
ret: 0 st:-1 flags:1 ts: 0.200839 | |||||
ret: 0 st: 0 flags:1 dts: 0.200833 pts: 0.200833 pos: 24425 size: 3840 | |||||
ret: 0 st: 0 flags:0 ts:-0.905000 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 | |||||
ret: 0 st: 0 flags:1 ts: 1.989167 | |||||
ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 | |||||
ret: 0 st:-1 flags:0 ts: 0.883340 | |||||
ret: 0 st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos: 89945 size: 3840 | |||||
ret: 0 st:-1 flags:1 ts:-0.222493 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 | |||||
ret: 0 st: 0 flags:0 ts: 2.671667 | |||||
ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 | |||||
ret: 0 st: 0 flags:1 ts: 1.565833 | |||||
ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 | |||||
ret: 0 st:-1 flags:0 ts: 0.460008 | |||||
ret: 0 st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos: 49305 size: 3840 | |||||
ret: 0 st:-1 flags:1 ts:-0.645825 | |||||
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 |