[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-113-g1f82c61

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  1f82c61cdfafee172de2c7555aa890d897aff036 (commit)
      from  014fa864e8051909d06f7d5543cf535629518e57 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=1f82c61cdfafee172de2c7555aa890d897aff036


commit 1f82c61cdfafee172de2c7555aa890d897aff036
Author: Sandro Santilli <address@hidden>
Date:   Tue Feb 22 18:13:24 2011 +0100

    1024 bytes turned out to be not enough to properly decode (or resample?) 
raw audio. 96000 works better (was maximum frame returned by decoder when 
passed bigger frames). Re-fixes #21177 and #22284 w/out breaking 
misc-ming.all/eventSoundTest1.swf

diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 
b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
index d448760..783c610 100644
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
@@ -663,9 +663,23 @@ AudioDecoderFfmpeg::parseInput(const boost::uint8_t* input,
     {
         // democratic value for a chunk to decode...
         // @todo this might be constrained by codec id, check that !
+
+        // NOTE: AVCODEC_MAX_AUDIO_FRAME_SIZE resulted bigger
+        //       than avcodec_decode_audio could handle, resulting
+        //       in eventSoundTest1.swf regression.
         //static const unsigned int maxFrameSize = 
AVCODEC_MAX_AUDIO_FRAME_SIZE;
-        //static const unsigned int maxFrameSize = 2;
-        static const unsigned int maxFrameSize = 1024;
+
+        // NOTE: 1024 resulted too few
+        //       to properly decode (or resample?) raw audio
+        //       thus resulting noisy (bugs #21177 and #22284)
+        //static const unsigned int maxFrameSize = 1024;
+
+        // NOTE: 96000 was found to be the max returned
+        //       by avcodec_decode_audio when passed anything
+        //       bigger than that. Works fine with all of
+        //       eventSoundTest1.swf, bug #21177 and bug #22284
+        //
+        static const unsigned int maxFrameSize = 96000;
 
         int frameSize = inputSize < maxFrameSize ? inputSize : maxFrameSize;
 

-----------------------------------------------------------------------

Summary of changes:
 libmedia/ffmpeg/AudioDecoderFfmpeg.cpp |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash