[Gnash-commit] gnash ChangeLog libbase/embedVideoDecoderFfmpeg...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/06/07 22:13:49

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&r1=1.3494&r2=1.3495
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.112&r2=1.113

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3494
retrieving revision 1.3495
diff -u -b -r1.3494 -r1.3495
--- ChangeLog   7 Jun 2007 18:59:50 -0000       1.3494
+++ ChangeLog   7 Jun 2007 22:13:46 -0000       1.3495
@@ -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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libbase/embedVideoDecoderFfmpeg.cpp 7 Jun 2007 12:10:21 -0000       1.15
+++ libbase/embedVideoDecoderFfmpeg.cpp 7 Jun 2007 22:13:47 -0000       1.16
@@ -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.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- server/swf/tag_loaders.cpp  6 Jun 2007 17:49:01 -0000       1.112
+++ server/swf/tag_loaders.cpp  7 Jun 2007 22:13:47 -0000       1.113
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.112 2007/06/06 17:49:01 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.113 2007/06/07 22:13:47 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1311,6 +1311,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;
       }
@@ -1326,6 +1327,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;
@@ -1339,6 +1341,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];