[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-112-g014fa86

[Bastiaan Jacques]

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  014fa864e8051909d06f7d5543cf535629518e57 (commit)
      from  2e5a11541ae1622ea25bd7a160e871fad656518e (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=014fa864e8051909d06f7d5543cf535629518e57


commit 014fa864e8051909d06f7d5543cf535629518e57
Author: Bastiaan Jacques <address@hidden>
Date:   Tue Feb 22 16:55:27 2011 +0100

    Revert "Don't cut an unparseable frame into small chunks. Fixes bug 
#21177." while we figure out the testsuite failure.
    
    This reverts commit caa7af4e06e910eafbe5792aba05d0b06780f29e.

diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 
b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
index 250b341..d448760 100644
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
@@ -661,11 +661,20 @@ AudioDecoderFfmpeg::parseInput(const boost::uint8_t* 
input,
     }
     else
     {
+        // democratic value for a chunk to decode...
+        // @todo this might be constrained by codec id, check that !
+        //static const unsigned int maxFrameSize = 
AVCODEC_MAX_AUDIO_FRAME_SIZE;
+        //static const unsigned int maxFrameSize = 2;
+        static const unsigned int maxFrameSize = 1024;
+
+        int frameSize = inputSize < maxFrameSize ? inputSize : maxFrameSize;
+
         // we assume the input is just a set of frames
         // and we'll consume all
         *outFrame = input; // frame always start on input
-        *outFrameSize = inputSize;
-        return inputSize;
+        *outFrameSize = frameSize;
+        int parsed = frameSize;
+        return parsed;
     }
 }
 

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

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


hooks/post-receive
-- 
Gnash