Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mark Reid authored on 2015/04/13 08:39:01... | ... |
@@ -23,6 +23,7 @@ FATE_LAVF-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += mulaw |
23 | 23 |
FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf |
24 | 24 |
FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10 |
25 | 25 |
FATE_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom |
26 |
+FATE_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio |
|
26 | 27 |
FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut |
27 | 28 |
FATE_LAVF-$(call ENCDEC, FLAC, OGG) += ogg |
28 | 29 |
FATE_LAVF-$(call ENCDEC, PAM, IMAGE2) += pam |
... | ... |
@@ -179,6 +179,7 @@ FATE_SEEK_LAVF-$(call ENCDEC, PCM_MULAW, PCM_MULAW) += mulaw |
179 | 179 |
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf |
180 | 180 |
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10 |
181 | 181 |
FATE_SEEK_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom |
182 |
+FATE_SEEK_LAVF-$(call ENCDEC2, DNXHD, PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio |
|
182 | 183 |
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut |
183 | 184 |
FATE_SEEK_LAVF-$(call ENCDEC, FLAC, OGG) += ogg |
184 | 185 |
FATE_SEEK_LAVF-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe |
... | ... |
@@ -218,6 +219,7 @@ fate-seek-lavf-mulaw: SRC = lavf/lavf.ul |
218 | 218 |
fate-seek-lavf-mxf: SRC = lavf/lavf.mxf |
219 | 219 |
fate-seek-lavf-mxf_d10: SRC = lavf/lavf.mxf_d10 |
220 | 220 |
fate-seek-lavf-mxf_opatom: SRC = lavf/lavf.mxf_opatom |
221 |
+fate-seek-lavf-mxf_opatom_audio: SRC = lavf/lavf.mxf_opatom_audio |
|
221 | 222 |
fate-seek-lavf-nut: SRC = lavf/lavf.nut |
222 | 223 |
fate-seek-lavf-ogg: SRC = lavf/lavf.ogg |
223 | 224 |
fate-seek-lavf-pbmpipe: SRC = lavf/pbmpipe.pbm |
... | ... |
@@ -94,6 +94,10 @@ if [ -n "$do_mxf_opatom" ]; then |
94 | 94 |
do_lavf mxf_opatom "" "-s 1920x1080 -vcodec dnxhd -pix_fmt yuv422p -vb 36M -f mxf_opatom -map 0" |
95 | 95 |
fi |
96 | 96 |
|
97 |
+if [ -n "$do_mxf_opatom_audio" ]; then |
|
98 |
+do_lavf mxf_opatom_audio "-ar 48000 -ac 1" "-f mxf_opatom -mxf_audio_edit_rate 25 -map 1" |
|
99 |
+fi |
|
100 |
+ |
|
97 | 101 |
if [ -n "$do_ts" ] ; then |
98 | 102 |
do_lavf ts "" "-ab 64k -mpegts_transport_stream_id 42 -ar 44100 -threads 1" |
99 | 103 |
fi |
0 | 3 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,53 @@ |
0 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 |
|
1 |
+ret: 0 st:-1 flags:0 ts:-1.000000 |
|
2 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 |
|
3 |
+ret: 0 st:-1 flags:1 ts: 1.894167 |
|
4 |
+ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 |
|
5 |
+ret: 0 st: 0 flags:0 ts: 0.788333 |
|
6 |
+ret: 0 st: 0 flags:1 dts: 0.788333 pts: 0.788333 pos: 80825 size: 3840 |
|
7 |
+ret: 0 st: 0 flags:1 ts:-0.317500 |
|
8 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 |
|
9 |
+ret: 0 st:-1 flags:0 ts: 2.576668 |
|
10 |
+ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 |
|
11 |
+ret: 0 st:-1 flags:1 ts: 1.470835 |
|
12 |
+ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 |
|
13 |
+ret: 0 st: 0 flags:0 ts: 0.365000 |
|
14 |
+ret: 0 st: 0 flags:1 dts: 0.365000 pts: 0.365000 pos: 40185 size: 3840 |
|
15 |
+ret: 0 st: 0 flags:1 ts:-0.740833 |
|
16 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 |
|
17 |
+ret: 0 st:-1 flags:0 ts: 2.153336 |
|
18 |
+ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 |
|
19 |
+ret: 0 st:-1 flags:1 ts: 1.047503 |
|
20 |
+ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 |
|
21 |
+ret: 0 st: 0 flags:0 ts:-0.058333 |
|
22 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 |
|
23 |
+ret: 0 st: 0 flags:1 ts: 2.835833 |
|
24 |
+ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 |
|
25 |
+ret: 0 st:-1 flags:0 ts: 1.730004 |
|
26 |
+ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 |
|
27 |
+ret: 0 st:-1 flags:1 ts: 0.624171 |
|
28 |
+ret: 0 st: 0 flags:1 dts: 0.624167 pts: 0.624167 pos: 65065 size: 3840 |
|
29 |
+ret: 0 st: 0 flags:0 ts:-0.481667 |
|
30 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 |
|
31 |
+ret: 0 st: 0 flags:1 ts: 2.412500 |
|
32 |
+ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 |
|
33 |
+ret: 0 st:-1 flags:0 ts: 1.306672 |
|
34 |
+ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 |
|
35 |
+ret: 0 st:-1 flags:1 ts: 0.200839 |
|
36 |
+ret: 0 st: 0 flags:1 dts: 0.200833 pts: 0.200833 pos: 24425 size: 3840 |
|
37 |
+ret: 0 st: 0 flags:0 ts:-0.905000 |
|
38 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 |
|
39 |
+ret: 0 st: 0 flags:1 ts: 1.989167 |
|
40 |
+ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 |
|
41 |
+ret: 0 st:-1 flags:0 ts: 0.883340 |
|
42 |
+ret: 0 st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos: 89945 size: 3840 |
|
43 |
+ret: 0 st:-1 flags:1 ts:-0.222493 |
|
44 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 |
|
45 |
+ret: 0 st: 0 flags:0 ts: 2.671667 |
|
46 |
+ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 |
|
47 |
+ret: 0 st: 0 flags:1 ts: 1.565833 |
|
48 |
+ret: 0 st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 101143 size: 2 |
|
49 |
+ret: 0 st:-1 flags:0 ts: 0.460008 |
|
50 |
+ret: 0 st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos: 49305 size: 3840 |
|
51 |
+ret: 0 st:-1 flags:1 ts:-0.645825 |
|
52 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 5145 size: 3840 |