FATE: avoid channel mixing in lavf-dv_fmt

This partially reverts acb1730218f1c614dc8ca3ba45d9de1e05059515 which would only have needed to change the checksums if channel mixing had been properly avoided. This changes the output file size reference and the seek test reference back to the previous values.

Justin Ruggles committed 14 years ago

Commit c5671ae1 parent 8c4022a3 files · +17 −17Browse files

Unified · Split

3 files

tests/lavf-regression.sh +1 −1
tests/ref/lavf/dv_fmt +3 −3
tests/ref/seek/lavf_dv +13 −13

tests/lavf-regression.sh+1−1

@@ -91,7 +91,7 @@ do_lavf mov "" "-acodec pcm_alaw -c:v mpeg4" · 90 unmodified lines
91	fi	91	fi
92		92
93	if [ -n "$do_dv_fmt" ] ; then	93	if [ -n "$do_dv_fmt" ] ; then
94	do_lavf dv "-ar 48000" "-r 25 -s pal -ac 2"	94	do_lavf dv "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
95	fi	95	fi
96		96
97	if [ -n "$do_gxf" ] ; then	97	if [ -n "$do_gxf" ] ; then

tests/ref/lavf/dv_fmt+3−3

@@ -1,3 +1,3 @@
1	62577aa72e7c7fb3e781e3717a7c36cb *./tests/data/lavf/lavf.dv	1	eb51fbb48af28584ea5515f9f2400fcd *./tests/data/lavf/lavf.dv
2	3456000 ./tests/data/lavf/lavf.dv	2	3600000 ./tests/data/lavf/lavf.dv
3	./tests/data/lavf/lavf.dv CRC=0x37e63092	3	./tests/data/lavf/lavf.dv CRC=0x0e868a82

tests/ref/seek/lavf_dv+13−13

FATE: avoid channel mixing in lavf-dv_fmt

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -2,51 +2,51 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 · 1 unmodified line
2	ret: 0 st:-1 flags:0 ts:-1.000000	2	ret: 0 st:-1 flags:0 ts:-1.000000
3	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000	3	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
4	ret: 0 st:-1 flags:1 ts: 1.894167	4	ret: 0 st:-1 flags:1 ts: 1.894167
5	ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000	5	ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
6	ret: 0 st: 0 flags:0 ts: 0.800000	6	ret: 0 st: 0 flags:0 ts: 0.800000
7	ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: -1 size:144000	7	ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: -1 size:144000
8	ret: 0 st: 0 flags:1 ts:-0.320000	8	ret: 0 st: 0 flags:1 ts:-0.320000
9	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000	9	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
10	ret: 0 st: 1 flags:0 ts: 2.576667	10	ret: 0 st: 1 flags:0 ts: 2.576667
11	ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000	11	ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
12	ret: 0 st: 1 flags:1 ts: 1.470833	12	ret: 0 st: 1 flags:1 ts: 1.470833
13	ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000	13	ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
14	ret: 0 st:-1 flags:0 ts: 0.365002	14	ret: 0 st:-1 flags:0 ts: 0.365002
15	ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: -1 size:144000	15	ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: -1 size:144000
16	ret: 0 st:-1 flags:1 ts:-0.740831	16	ret: 0 st:-1 flags:1 ts:-0.740831
17	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000	17	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
18	ret: 0 st: 0 flags:0 ts: 2.160000	18	ret: 0 st: 0 flags:0 ts: 2.160000
19	ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000	19	ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
20	ret: 0 st: 0 flags:1 ts: 1.040000	20	ret: 0 st: 0 flags:1 ts: 1.040000
21	ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000	21	ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
22	ret: 0 st: 1 flags:0 ts:-0.058333	22	ret: 0 st: 1 flags:0 ts:-0.058333
23	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000	23	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
24	ret: 0 st: 1 flags:1 ts: 2.835833	24	ret: 0 st: 1 flags:1 ts: 2.835833
25	ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000	25	ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
26	ret: 0 st:-1 flags:0 ts: 1.730004	26	ret: 0 st:-1 flags:0 ts: 1.730004
27	ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000	27	ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
28	ret: 0 st:-1 flags:1 ts: 0.624171	28	ret: 0 st:-1 flags:1 ts: 0.624171
29	ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: -1 size:144000	29	ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: -1 size:144000
30	ret: 0 st: 0 flags:0 ts:-0.480000	30	ret: 0 st: 0 flags:0 ts:-0.480000
31	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000	31	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
32	ret: 0 st: 0 flags:1 ts: 2.400000	32	ret: 0 st: 0 flags:1 ts: 2.400000
33	ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000	33	ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
34	ret: 0 st: 1 flags:0 ts: 1.306667	34	ret: 0 st: 1 flags:0 ts: 1.306667
35	ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000	35	ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
36	ret: 0 st: 1 flags:1 ts: 0.200833	36	ret: 0 st: 1 flags:1 ts: 0.200833
37	ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000	37	ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
38	ret: 0 st:-1 flags:0 ts:-0.904994	38	ret: 0 st:-1 flags:0 ts:-0.904994
39	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000	39	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
40	ret: 0 st:-1 flags:1 ts: 1.989173	40	ret: 0 st:-1 flags:1 ts: 1.989173
41	ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000	41	ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
42	ret: 0 st: 0 flags:0 ts: 0.880000	42	ret: 0 st: 0 flags:0 ts: 0.880000
43	ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: -1 size:144000	43	ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: -1 size:144000
44	ret: 0 st: 0 flags:1 ts:-0.240000	44	ret: 0 st: 0 flags:1 ts:-0.240000
45	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000	45	ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
46	ret: 0 st: 1 flags:0 ts: 2.671667	46	ret: 0 st: 1 flags:0 ts: 2.671667
47	ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000	47	ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
48	ret: 0 st: 1 flags:1 ts: 1.565833	48	ret: 0 st: 1 flags:1 ts: 1.565833
49	ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000	49	ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000
50	ret: 0 st:-1 flags:0 ts: 0.460008	50	ret: 0 st:-1 flags:0 ts: 0.460008
51	ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: -1 size:144000	51	ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: -1 size:144000
52	ret: 0 st:-1 flags:1 ts:-0.645825	52	ret: 0 st:-1 flags:1 ts:-0.645825