diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-04-24 15:50:20 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-04-24 15:55:45 -0400 |
| commit | c5671aeb77abb18a5a10ace314ab49e8fd3d0cb3 (patch) | |
| tree | c8ee72ec8dff805f65a0dc47e4e24270e8ccb6b9 | |
| parent | 8c4022aceb68558df655059cef4d570625dc1d09 (diff) | |
| download | ffmpeg-streaming-c5671aeb77abb18a5a10ace314ab49e8fd3d0cb3.zip ffmpeg-streaming-c5671aeb77abb18a5a10ace314ab49e8fd3d0cb3.tar.gz | |
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.
| -rwxr-xr-x | tests/lavf-regression.sh | 2 | ||||
| -rw-r--r-- | tests/ref/lavf/dv_fmt | 6 | ||||
| -rw-r--r-- | tests/ref/seek/lavf_dv | 26 |
3 files changed, 17 insertions, 17 deletions
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 54da522..ab8064d 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -91,7 +91,7 @@ do_lavf mov "" "-acodec pcm_alaw -c:v mpeg4" fi if [ -n "$do_dv_fmt" ] ; then -do_lavf dv "-ar 48000" "-r 25 -s pal -ac 2" +do_lavf dv "-ar 48000 -channel_layout stereo" "-r 25 -s pal" fi if [ -n "$do_gxf" ] ; then diff --git a/tests/ref/lavf/dv_fmt b/tests/ref/lavf/dv_fmt index 7615fb5..c2b7335 100644 --- a/tests/ref/lavf/dv_fmt +++ b/tests/ref/lavf/dv_fmt @@ -1,3 +1,3 @@ -62577aa72e7c7fb3e781e3717a7c36cb *./tests/data/lavf/lavf.dv -3456000 ./tests/data/lavf/lavf.dv -./tests/data/lavf/lavf.dv CRC=0x37e63092 +eb51fbb48af28584ea5515f9f2400fcd *./tests/data/lavf/lavf.dv +3600000 ./tests/data/lavf/lavf.dv +./tests/data/lavf/lavf.dv CRC=0x0e868a82 diff --git a/tests/ref/seek/lavf_dv b/tests/ref/seek/lavf_dv index 8ac9404..3c49749 100644 --- a/tests/ref/seek/lavf_dv +++ b/tests/ref/seek/lavf_dv @@ -2,51 +2,51 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 ret: 0 st: 0 flags:0 ts: 0.800000 ret: 0 st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: -1 size:144000 ret: 0 st: 0 flags:1 ts:-0.320000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 ret: 0 st: 1 flags:0 ts: 2.576667 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 ret: 0 st: 1 flags:1 ts: 1.470833 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 ret: 0 st:-1 flags:0 ts: 0.365002 ret: 0 st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: -1 size:144000 ret: 0 st:-1 flags:1 ts:-0.740831 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 ret: 0 st: 0 flags:0 ts: 2.160000 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 ret: 0 st: 0 flags:1 ts: 1.040000 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 ret: 0 st: 1 flags:0 ts:-0.058333 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 ret: 0 st: 1 flags:1 ts: 2.835833 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 ret: 0 st:-1 flags:1 ts: 0.624171 ret: 0 st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: -1 size:144000 ret: 0 st: 0 flags:0 ts:-0.480000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 ret: 0 st: 0 flags:1 ts: 2.400000 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 ret: 0 st: 1 flags:0 ts: 1.306667 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 ret: 0 st: 1 flags:1 ts: 0.200833 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 ret: 0 st:-1 flags:0 ts:-0.904994 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 ret: 0 st: 0 flags:0 ts: 0.880000 ret: 0 st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: -1 size:144000 ret: 0 st: 0 flags:1 ts:-0.240000 ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: -1 size:144000 ret: 0 st: 1 flags:0 ts: 2.671667 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 ret: 0 st: 1 flags:1 ts: 1.565833 -ret: 0 st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos: -1 size:144000 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: -1 size:144000 ret: 0 st:-1 flags:0 ts: 0.460008 ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: -1 size:144000 ret: 0 st:-1 flags:1 ts:-0.645825 |
