aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate-run.sh
diff options
context:
space:
mode:
authorwm4 <nfxjfg@googlemail.com>2015-04-20 19:36:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-20 19:50:58 +0200
commit1e2e22ec616b4a7adb1091d2466e8b5aeb04e7b3 (patch)
tree1f532eb29086b785cb681c2c826150e18371e6ce /tests/fate-run.sh
parentbac7084fbd372676b6a4c7c1ab487640d4f945de (diff)
downloadffmpeg-1e2e22ec616b4a7adb1091d2466e8b5aeb04e7b3.tar.gz
fate: gapless: fix mp3 tests
Seeking to a negative time did not have the desired effect of seeking to the next valid position (the file start). On the other hand, just "-ss 0" will normally seek to a position higher than 0, because it adds the start time of the file. (The start time is not 0 because the gapless code skips a few samples from the start.) Fix this by using the "-seek_timestamp 1" option, which makes "-ss 0" do what you'd expect it would do. Also put the -ss option at the right place, before -i. This actually makes it seek, instead of something completely else. The ".out-3" test is no different in the -usetoc 0/1 cases, because the seeking is inaccurate (in both cases). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate-run.sh')
-rwxr-xr-xtests/fate-run.sh13
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 0165812208..1a8ff940bd 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -229,20 +229,17 @@ gapless(){
decfile3="${outdir}/${test}.out-3"
cleanfiles="$cleanfiles $decfile1 $decfile2 $decfile3"
- # large enough to make ffmpeg.c seek to the start of the file
- start_offset=-1
-
# test packet data
- ffmpeg -i "$sample" $extra_args -flags +bitexact -c:a copy -f framecrc -y $decfile1
+ ffmpeg $extra_args -i "$sample" -flags +bitexact -c:a copy -f framecrc -y $decfile1
do_md5sum $decfile1
# test decoded (and cut) data
- ffmpeg -i "$sample" $extra_args -flags +bitexact -f wav md5:
+ ffmpeg $extra_args -i "$sample" -flags +bitexact -f wav md5:
# the same as above again, with seeking to the start
- ffmpeg -ss $start_offset -i "$sample" $extra_args -flags +bitexact -c:a copy -f framecrc -y $decfile2
+ ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -c:a copy -f framecrc -y $decfile2
do_md5sum $decfile2
- ffmpeg -ss $start_offset -i "$sample" $extra_args -flags +bitexact -f wav md5:
+ ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -f wav md5:
# test packet data, with seeking to a specific position
- ffmpeg -ss 5 -i "$sample" $extra_args -flags +bitexact -c:a copy -f framecrc -y $decfile3
+ ffmpeg $extra_args -ss 5 -seek_timestamp 1 -i "$sample" -flags +bitexact -c:a copy -f framecrc -y $decfile3
do_md5sum $decfile3
}