Also factorize the common options for the different mov-based tests.
Since the header is now on top in the last generated file, the data
offset in the seek test needed some updates as well.
... | ... |
@@ -107,8 +107,9 @@ do_lavf flv "" "-an" |
107 | 107 |
fi |
108 | 108 |
|
109 | 109 |
if [ -n "$do_mov" ] ; then |
110 |
-do_lavf mov "" "-movflags +rtphint -acodec pcm_alaw -vcodec mpeg4" |
|
111 |
-do_lavf_timecode mov "-acodec pcm_alaw -vcodec mpeg4" |
|
110 |
+mov_common_opt="-acodec pcm_alaw -vcodec mpeg4" |
|
111 |
+do_lavf mov "" "-movflags +rtphint $mov_common_opt" |
|
112 |
+do_lavf_timecode mov "-movflags +faststart $mov_common_opt" |
|
112 | 113 |
fi |
113 | 114 |
|
114 | 115 |
if [ -n "$do_ismv" ] ; then |
... | ... |
@@ -1,12 +1,12 @@ |
1 | 1 |
2c58e6422013d9cd6169f272ffba7a33 *./tests/data/lavf/lavf.mov |
2 | 2 |
367373 ./tests/data/lavf/lavf.mov |
3 | 3 |
./tests/data/lavf/lavf.mov CRC=0x2f6a9b26 |
4 |
-21b992f6a677f971dfd685cc055a2b0a *./tests/data/lavf/lavf.mov |
|
4 |
+5e5db229636424e92d21810adb6a7ea2 *./tests/data/lavf/lavf.mov |
|
5 | 5 |
358463 ./tests/data/lavf/lavf.mov |
6 | 6 |
./tests/data/lavf/lavf.mov CRC=0x2f6a9b26 |
7 |
-f607c5ac4f2668149c064d75a4ddd0dd *./tests/data/lavf/lavf.mov |
|
7 |
+91a92fb183da44202ea6f22d163337aa *./tests/data/lavf/lavf.mov |
|
8 | 8 |
377609 ./tests/data/lavf/lavf.mov |
9 | 9 |
./tests/data/lavf/lavf.mov CRC=0x4e671506 |
10 |
-305a68397e3cdb505704841fedcdc352 *./tests/data/lavf/lavf.mov |
|
10 |
+928e6ffcfd5c73c1961fd38c1ccf3f78 *./tests/data/lavf/lavf.mov |
|
11 | 11 |
357845 ./tests/data/lavf/lavf.mov |
12 | 12 |
./tests/data/lavf/lavf.mov CRC=0x2f6a9b26 |
... | ... |
@@ -1,48 +1,48 @@ |
1 |
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 27837 |
|
1 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 |
|
2 | 2 |
ret: 0 st:-1 flags:0 ts:-1.000000 |
3 |
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 27837 |
|
3 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 |
|
4 | 4 |
ret: 0 st:-1 flags:1 ts: 1.894167 |
5 |
-ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 325248 size: 1024 |
|
5 |
+ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326939 size: 1024 |
|
6 | 6 |
ret: 0 st: 0 flags:0 ts: 0.800000 |
7 |
-ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326272 size: 27834 |
|
7 |
+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327963 size: 27834 |
|
8 | 8 |
ret: 0 st: 0 flags:1 ts:-0.320000 |
9 |
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 27837 |
|
9 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 |
|
10 | 10 |
ret:-1 st: 1 flags:0 ts: 2.576667 |
11 | 11 |
ret: 0 st: 1 flags:1 ts: 1.470839 |
12 |
-ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326272 size: 27834 |
|
12 |
+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327963 size: 27834 |
|
13 | 13 |
ret: 0 st:-1 flags:0 ts: 0.365002 |
14 |
-ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 163526 size: 27925 |
|
14 |
+ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165217 size: 27925 |
|
15 | 15 |
ret: 0 st:-1 flags:1 ts:-0.740831 |
16 |
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 27837 |
|
16 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 |
|
17 | 17 |
ret:-1 st: 0 flags:0 ts: 2.160000 |
18 | 18 |
ret: 0 st: 0 flags:1 ts: 1.040000 |
19 |
-ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 325248 size: 1024 |
|
19 |
+ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326939 size: 1024 |
|
20 | 20 |
ret: 0 st: 1 flags:0 ts:-0.058322 |
21 |
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 27837 |
|
21 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 |
|
22 | 22 |
ret: 0 st: 1 flags:1 ts: 2.835828 |
23 |
-ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326272 size: 27834 |
|
23 |
+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327963 size: 27834 |
|
24 | 24 |
ret:-1 st:-1 flags:0 ts: 1.730004 |
25 | 25 |
ret: 0 st:-1 flags:1 ts: 0.624171 |
26 |
-ret: 0 st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 162502 size: 1024 |
|
26 |
+ret: 0 st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 164193 size: 1024 |
|
27 | 27 |
ret: 0 st: 0 flags:0 ts:-0.480000 |
28 |
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 27837 |
|
28 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 |
|
29 | 29 |
ret: 0 st: 0 flags:1 ts: 2.400000 |
30 |
-ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 325248 size: 1024 |
|
30 |
+ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326939 size: 1024 |
|
31 | 31 |
ret:-1 st: 1 flags:0 ts: 1.306667 |
32 | 32 |
ret: 0 st: 1 flags:1 ts: 0.200839 |
33 |
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 27837 |
|
33 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 |
|
34 | 34 |
ret: 0 st:-1 flags:0 ts:-0.904994 |
35 |
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 27837 |
|
35 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 |
|
36 | 36 |
ret: 0 st:-1 flags:1 ts: 1.989173 |
37 |
-ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 325248 size: 1024 |
|
37 |
+ret: 0 st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326939 size: 1024 |
|
38 | 38 |
ret: 0 st: 0 flags:0 ts: 0.880000 |
39 |
-ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326272 size: 27834 |
|
39 |
+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327963 size: 27834 |
|
40 | 40 |
ret: 0 st: 0 flags:1 ts:-0.240000 |
41 |
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 27837 |
|
41 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 |
|
42 | 42 |
ret:-1 st: 1 flags:0 ts: 2.671678 |
43 | 43 |
ret: 0 st: 1 flags:1 ts: 1.565850 |
44 |
-ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326272 size: 27834 |
|
44 |
+ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327963 size: 27834 |
|
45 | 45 |
ret: 0 st:-1 flags:0 ts: 0.460008 |
46 |
-ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 163526 size: 27925 |
|
46 |
+ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165217 size: 27925 |
|
47 | 47 |
ret: 0 st:-1 flags:1 ts:-0.645825 |
48 |
-ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 36 size: 27837 |
|
48 |
+ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 1727 size: 27837 |