[Gnash-commit] gnash ChangeLog libbase/embedVideoDecoderFfmpeg... [release-0-8-0]

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release-0-8-0
Changes by:     Tomas Groth <tgc>       07/06/07 22:15:47

Modified files:
        .              : ChangeLog 
        libbase        : embedVideoDecoderFfmpeg.cpp 
        server/swf     : tag_loaders.cpp 

Log message:
                * libbase/embedVideoDecoderFfmpeg.cpp: Free the av_frame after 
use.
                * server/swf/tag_loaders.cpp: Adjust size of audio after 
decoding.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.3451.2.45&r2=1.3451.2.46
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderFfmpeg.cpp?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.13.4.2&r2=1.13.4.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.111&r2=1.111.4.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3451.2.45
retrieving revision 1.3451.2.46
diff -u -b -r1.3451.2.45 -r1.3451.2.46
--- ChangeLog   7 Jun 2007 18:22:22 -0000       1.3451.2.45
+++ ChangeLog   7 Jun 2007 22:15:45 -0000       1.3451.2.46
@@ -1,3 +1,8 @@
+2007-06-07 Tomas Groth Christensen <address@hidden>
+
+       * libbase/embedVideoDecoderFfmpeg.cpp: Free the av_frame after use.
+       * server/swf/tag_loaders.cpp: Adjust size of audio after decoding.
+
 2007-06-07 Sandro Santilli <address@hidden>
 
        * macros/ffmpeg.m4: check for libgsm and add to FFMPEG_LIBS if

Index: libbase/embedVideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoderFfmpeg.cpp,v
retrieving revision 1.13.4.2
retrieving revision 1.13.4.3
diff -u -b -r1.13.4.2 -r1.13.4.3
--- libbase/embedVideoDecoderFfmpeg.cpp 7 Jun 2007 12:12:35 -0000       1.13.4.2
+++ libbase/embedVideoDecoderFfmpeg.cpp 7 Jun 2007 22:15:47 -0000       1.13.4.3
@@ -222,6 +222,7 @@
                }
        }
 
+       av_free(frame);
        ret_image->update(decodedFrame->m_data);
        return ret_image;
 }

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.111
retrieving revision 1.111.4.1
diff -u -b -r1.111 -r1.111.4.1
--- server/swf/tag_loaders.cpp  25 May 2007 12:41:48 -0000      1.111
+++ server/swf/tag_loaders.cpp  7 Jun 2007 22:15:47 -0000       1.111.4.1
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.111 2007/05/25 12:41:48 bjacques Exp $ */
+/* $Id: tag_loaders.cpp,v 1.111.4.1 2007/06/07 22:15:47 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1305,6 +1305,7 @@
        // Uncompress the ADPCM before handing data to host.
        unsigned sample_count = data_bytes / (stereo ? 4 : 2);
        adpcm_expand(data, in, sample_count, stereo);
+       data_bytes = sample_count * (stereo ? 4 : 2) * (sample_16bit ? 2 : 1);
        format = sound_handler::FORMAT_NATIVE16;
        break;
       }
@@ -1320,6 +1321,7 @@
            // Allocate as many shorts as there are samples
            unsigned sample_count = data_bytes / (stereo ? 2 : 1);
            u8_expand(data, in, sample_count, stereo);
+               data_bytes = sample_count * (stereo ? 4 : 2) * 2;
        }
        format = sound_handler::FORMAT_NATIVE16;
        break;
@@ -1333,6 +1335,8 @@
            // Allocate as many shorts as there are 8-bit samples
            unsigned sample_count = data_bytes / (stereo ? 2 : 1);
            u8_expand(data, in, sample_count, stereo);
+               data_bytes = sample_count * (stereo ? 4 : 2) * 2;
+
        } else {
            // Read 16-bit data into buffer
            data = new unsigned char[data_bytes];