diff options
| author | Justin Ruggles <jruggle@earthlink.net> | 2006-06-27 21:01:21 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-06-27 21:01:21 +0000 |
| commit | e71bcc37986c7bd7f31c93e2cee3ddd18b4e9416 (patch) | |
| tree | 318d97a8b33f23a998195ccf03765e43e9195116 /tests | |
| parent | f26c2ef53b68f4e7e0f8e4eac8466b4fdeffb8b1 (diff) | |
| download | ffmpeg-e71bcc37986c7bd7f31c93e2cee3ddd18b4e9416.tar.gz | |
flacenc - rice param search patch by (Justin Ruggles jruggle earthlink net
1) search for optimal rice parameters and partition order. i also
modified the stereo method estimation to use this to calculate estimated
bit count instead of using just the pure sums.
2) search for the best fixed prediction order
3) constant subframe mode (good for encoding silence)
Note that the regression test for the decoded wav file also changed.
This is due to FFmpeg's FLAC decoder truncating the file, which it did
before anyway...just at a different cutoff point. The generated FLAC
files are still 100% lossless.
With this update, FFmpeg's FLAC encoder has speed and compression
somewhere between "flac -1" and "flac -2". On my machine, it's about
15% faster than "flac -2", and about 10% slower than "flac -1". The
encoding parameters are identical to "flac -2" (fixed predictors, 1152
blocksize, partition order 0 to 3).
Originally committed as revision 5536 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ffmpeg.regression.ref | 8 | ||||
| -rw-r--r-- | tests/rotozoom.regression.ref | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index c8864a3346..b5dda091f8 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -176,7 +176,7 @@ stddev:1050.18 PSNR:35.89 bytes:1054720 264236 ./data/a-adpcm_yam.wav e92cec8c07913ffb91ad2b11f79cdc00 *./data/out.wav stddev:18312.68 PSNR:11.06 bytes:1056768 -9ed4957501a56ce9d4e6a6611553a45f *./data/a-flac.flac -801577 ./data/a-flac.flac -0116cdcefd0aeae3ab8e5140c19c725d *./data/out.wav -stddev: 51.59 PSNR:62.07 bytes:1032192 +9ab5f311b70bc1fa8591b891db50b386 *./data/a-flac.flac +353384 ./data/a-flac.flac +c4228df189aad9567a037727d0e763e4 *./data/out.wav +stddev: 33.31 PSNR:65.87 bytes:1040384 diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref index f3b796a565..4a77bb9250 100644 --- a/tests/rotozoom.regression.ref +++ b/tests/rotozoom.regression.ref @@ -176,7 +176,7 @@ stddev:1050.18 PSNR:35.89 bytes:1054720 264236 ./data/a-adpcm_yam.wav e92cec8c07913ffb91ad2b11f79cdc00 *./data/out.wav stddev:18312.68 PSNR:11.06 bytes:1056768 -9ed4957501a56ce9d4e6a6611553a45f *./data/a-flac.flac -801577 ./data/a-flac.flac -0116cdcefd0aeae3ab8e5140c19c725d *./data/out.wav -stddev: 51.59 PSNR:62.07 bytes:1032192 +9ab5f311b70bc1fa8591b891db50b386 *./data/a-flac.flac +353384 ./data/a-flac.flac +c4228df189aad9567a037727d0e763e4 *./data/out.wav +stddev: 33.31 PSNR:65.87 bytes:1040384 |