diff options
| author | Bill O'Shaughnessy <bill.oshaughnessy@gmail.com> | 2007-03-18 23:18:05 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2007-03-18 23:18:05 +0000 |
| commit | 4140a5234ee0aa7e49467df497f2655e758d1cf6 (patch) | |
| tree | 6421669fea2d14d9443b757311c2fc200d7e9d14 | |
| parent | d7645fb9dbf79f47faaa42a228482a2ba01e8b73 (diff) | |
| download | ffmpeg-4140a5234ee0aa7e49467df497f2655e758d1cf6.tar.gz | |
AC-3 encoded volume is too high. Revert revision 7160:
bring AC3 encoder output up to input volume level
patch by Bill O'Shaughnessy % bill P oshaughnessy A gmail.com %
+ reg tests update gruntwork by me
Original thread:
date: Nov 21, 2006 11:36PM
subject: [Ffmpeg-devel] Simpler Patch to bring AC3 encoder output up to input level
Originally committed as revision 8444 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/ac3enc.c | 2 | ||||
| -rw-r--r-- | tests/ffmpeg.regression.ref | 2 | ||||
| -rw-r--r-- | tests/libav.regression.ref | 2 | ||||
| -rw-r--r-- | tests/rotozoom.regression.ref | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 623541d23b..358f4e174d 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -1161,7 +1161,7 @@ static int AC3_encode_frame(AVCodecContext *avctx, v = 14 - log2_tab(input_samples, N); if (v < 0) v = 0; - exp_samples[i][ch] = v - 10; + exp_samples[i][ch] = v - 9; lshift_tab(input_samples, N, v); /* do the MDCT */ diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref index b599a08c8d..29d3ffe10f 100644 --- a/tests/ffmpeg.regression.ref +++ b/tests/ffmpeg.regression.ref @@ -166,7 +166,7 @@ stddev: 10.98 PSNR:27.30 bytes:7602176 83f8df5d5f84480566af548bb037fceb *./data/out.wav stddev:9330.70 PSNR:16.92 bytes:1054720 stddev:4396.13 PSNR:23.46 bytes:1052672 -dd68110cb7e5388392f89d5160d3a825 *./data/a-ac3.rm +aefe11ab5067621a1c674859d6413891 *./data/a-ac3.rm 98203 ./data/a-ac3.rm 1eea0440091a8f898c9efca99141456e *./data/a-g726.wav 24280 ./data/a-g726.wav diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index 6c245658b5..4ae54b737d 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -5,7 +5,7 @@ ffmpeg regression test 786446e80ead936e5faa8f5908f19281 *./data/b-libav.asf 339775 ./data/b-libav.asf ./data/b-libav.asf CRC=0x74113749 -1ad618e9fd318eb3483270cf9b9b3f43 *./data/b-libav.rm +1ce78eeb6881ffe5b649a9b5105de919 *./data/b-libav.rm 355405 ./data/b-libav.rm bdb7484c68db722f66ba1630cf79844c *./data/b-libav.mpg 378880 ./data/b-libav.mpg diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref index 897d9266a0..5929f7abee 100644 --- a/tests/rotozoom.regression.ref +++ b/tests/rotozoom.regression.ref @@ -166,7 +166,7 @@ stddev: 3.44 PSNR:37.39 bytes:7602176 83f8df5d5f84480566af548bb037fceb *./data/out.wav stddev:9330.70 PSNR:16.92 bytes:1054720 stddev:4396.13 PSNR:23.46 bytes:1052672 -dd68110cb7e5388392f89d5160d3a825 *./data/a-ac3.rm +aefe11ab5067621a1c674859d6413891 *./data/a-ac3.rm 98203 ./data/a-ac3.rm 1eea0440091a8f898c9efca99141456e *./data/a-g726.wav 24280 ./data/a-g726.wav |