[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-111-g2e5a115

[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  2e5a11541ae1622ea25bd7a160e871fad656518e (commit)
       via  caa7af4e06e910eafbe5792aba05d0b06780f29e (commit)
       via  b4f98a63b71391d9d5d60e06e8235d5468ea388a (commit)
      from  0f04fd35db8a343d02d4af149990d5a9499ac016 (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=2e5a11541ae1622ea25bd7a160e871fad656518e


commit 2e5a11541ae1622ea25bd7a160e871fad656518e
Merge: caa7af4 0f04fd3
Author: Bastiaan Jacques <address@hidden>
Date:   Tue Feb 22 14:56:36 2011 +0100

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=caa7af4e06e910eafbe5792aba05d0b06780f29e


commit caa7af4e06e910eafbe5792aba05d0b06780f29e
Author: Bastiaan Jacques <address@hidden>
Date:   Tue Feb 22 14:56:24 2011 +0100

    Don't cut an unparseable frame into small chunks. Fixes bug #21177.

diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 
b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
index d448760..250b341 100644
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
@@ -661,20 +661,11 @@ 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 = frameSize;
-        int parsed = frameSize;
-        return parsed;
+        *outFrameSize = inputSize;
+        return inputSize;
     }
 }
 

http://git.savannah.gnu.org/cgit//commit/?id=b4f98a63b71391d9d5d60e06e8235d5468ea388a


commit b4f98a63b71391d9d5d60e06e8235d5468ea388a
Author: Bastiaan Jacques <address@hidden>
Date:   Tue Feb 22 14:13:45 2011 +0100

    Have AudioDecoderGst handle ADPCM audio.

diff --git a/libmedia/gst/AudioDecoderGst.cpp b/libmedia/gst/AudioDecoderGst.cpp
index 110a33d..fd3ca55 100644
--- a/libmedia/gst/AudioDecoderGst.cpp
+++ b/libmedia/gst/AudioDecoderGst.cpp
@@ -72,6 +72,16 @@ AudioDecoderGst::AudioDecoderGst(const AudioInfo& info)
         return;
     }
 
+    if (info.type == CODEC_TYPE_FLASH && info.codec == AUDIO_CODEC_ADPCM)
+    {
+        srccaps = gst_caps_new_simple ("audio/x-adpcm",
+                "rate", G_TYPE_INT, info.sampleRate,
+                "channels", G_TYPE_INT, info.stereo ? 2 : 1, 
+                "layout", G_TYPE_STRING, "swf", NULL);
+        setup(srccaps);
+        return;
+    }
+
     if (info.type == CODEC_TYPE_FLASH && info.codec == AUDIO_CODEC_AAC)
     {
         srccaps = gst_caps_new_simple ("audio/mpeg",

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

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


hooks/post-receive
-- 
Gnash