diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-04-20 19:36:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 19:50:58 +0200 |
| commit | 1e2e22ec616b4a7adb1091d2466e8b5aeb04e7b3 (patch) | |
| tree | 1f532eb29086b785cb681c2c826150e18371e6ce | |
| parent | bac7084fbd372676b6a4c7c1ab487640d4f945de (diff) | |
| download | ffmpeg-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>
| -rwxr-xr-x | tests/fate-run.sh | 13 | ||||
| -rw-r--r-- | tests/ref/fate/gapless-mp3 | 4 | ||||
| -rw-r--r-- | tests/ref/fate/gapless-mp3-notoc | 4 |
3 files changed, 9 insertions, 12 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 } diff --git a/tests/ref/fate/gapless-mp3 b/tests/ref/fate/gapless-mp3 index 3cff9a86f9..984ae8489d 100644 --- a/tests/ref/fate/gapless-mp3 +++ b/tests/ref/fate/gapless-mp3 @@ -1,5 +1,5 @@ d5c88cf38416329a052a9b0cb140fb4c *tests/data/fate/gapless-mp3.out-1 c96c3ae7bd3300fd2f4debac222de5b7 -68f040b12d79c71e3b2e8ba90a9cbd96 *tests/data/fate/gapless-mp3.out-2 +3386bc2009b31b7ef39247918cbb02a5 *tests/data/fate/gapless-mp3.out-2 c96c3ae7bd3300fd2f4debac222de5b7 -e750fc8ae00ba29a03983edafbb63975 *tests/data/fate/gapless-mp3.out-3 +70e7cd7f2b6365e7f48ed206113f06fc *tests/data/fate/gapless-mp3.out-3 diff --git a/tests/ref/fate/gapless-mp3-notoc b/tests/ref/fate/gapless-mp3-notoc index 3528e71f96..f52efff249 100644 --- a/tests/ref/fate/gapless-mp3-notoc +++ b/tests/ref/fate/gapless-mp3-notoc @@ -1,5 +1,5 @@ d5c88cf38416329a052a9b0cb140fb4c *tests/data/fate/gapless-mp3-notoc.out-1 c96c3ae7bd3300fd2f4debac222de5b7 -68f040b12d79c71e3b2e8ba90a9cbd96 *tests/data/fate/gapless-mp3-notoc.out-2 +3386bc2009b31b7ef39247918cbb02a5 *tests/data/fate/gapless-mp3-notoc.out-2 c96c3ae7bd3300fd2f4debac222de5b7 -e750fc8ae00ba29a03983edafbb63975 *tests/data/fate/gapless-mp3-notoc.out-3 +e82eaed507ce3f7f6199918159e1ddd7 *tests/data/fate/gapless-mp3-notoc.out-3 |