History

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
  1. tests/lavf-regression.sh +1 −1
  2. tests/ref/lavf/dv_fmt +3 −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
9191 fi
9292
9393 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"
9595 fi
9696
9797 if [ -n "$do_gxf" ] ; then
tests/ref/lavf/dv_fmt+3−3
@@ -1,3 +1,3 @@
1−62577aa72e7c7fb3e781e3717a7c36cb *./tests/data/lavf/lavf.dv
2−3456000 ./tests/data/lavf/lavf.dv
3−./tests/data/lavf/lavf.dv CRC=0x37e63092
1+eb51fbb48af28584ea5515f9f2400fcd *./tests/data/lavf/lavf.dv
2+3600000 ./tests/data/lavf/lavf.dv
3+./tests/data/lavf/lavf.dv CRC=0x0e868a82
tests/ref/seek/lavf_dv+13−13
@@ -2,51 +2,51 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 · 1 unmodified line
22 ret: 0 st:-1 flags:0 ts:-1.000000
33 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
44 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
66 ret: 0 st: 0 flags:0 ts: 0.800000
77 ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: -1 size:144000
88 ret: 0 st: 0 flags:1 ts:-0.320000
99 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
1010 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
1212 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
1414 ret: 0 st:-1 flags:0 ts: 0.365002
1515 ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: -1 size:144000
1616 ret: 0 st:-1 flags:1 ts:-0.740831
1717 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
1818 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
2020 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
2222 ret: 0 st: 1 flags:0 ts:-0.058333
2323 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
2424 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
2626 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
2828 ret: 0 st:-1 flags:1 ts: 0.624171
2929 ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: -1 size:144000
3030 ret: 0 st: 0 flags:0 ts:-0.480000
3131 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
3232 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
3434 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
3636 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
3838 ret: 0 st:-1 flags:0 ts:-0.904994
3939 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
4040 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
4242 ret: 0 st: 0 flags:0 ts: 0.880000
4343 ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: -1 size:144000
4444 ret: 0 st: 0 flags:1 ts:-0.240000
4545 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000
4646 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
4848 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
5050 ret: 0 st:-1 flags:0 ts: 0.460008
5151 ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: -1 size:144000
5252 ret: 0 st:-1 flags:1 ts:-0.645825

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t