[Gnash-commit] gnash server/swf/tag_loaders.cpp ChangeLog

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/05/18 15:39:53

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

Log message:
                * server/swf/tag_loaders.cpp: Bug fix: calculate # samples 
correctly.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3273&r2=1.3274

Patches:
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- server/swf/tag_loaders.cpp  18 May 2007 10:25:43 -0000      1.102
+++ server/swf/tag_loaders.cpp  18 May 2007 15:39:51 -0000      1.103
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.102 2007/05/18 10:25:43 martinwguy Exp $ */
+/* $Id: tag_loaders.cpp,v 1.103 2007/05/18 15:39:51 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1398,14 +1398,15 @@
     // The format in the input file is in stream_input_*
     sound_handler::format_type format = stream_input_format;
 
+    unsigned sample_count = data_bytes;
+    if (stream_input_stereo)  sample_count /= 2;
+    if (stream_input_is16bit) sample_count /= 2;
+
     sound_expand(in, format,
                 stream_input_is16bit, stream_input_stereo,
                 data, data_bytes);
     // "format" now reflects what we hand(ed) to the sound drivers.
-
-    unsigned sample_count = data_bytes;
-    if (stream_input_stereo)  sample_count /= 2;
-    if (stream_input_is16bit) sample_count /= 2;
+    // "data_bytes" now reflects the size of the uncompressed data.
 
     // Fill the data on the apropiate sound, and receives the starting point
     // for later "start playing from this frame" events.

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3273
retrieving revision 1.3274
diff -u -b -r1.3273 -r1.3274
--- ChangeLog   18 May 2007 15:28:02 -0000      1.3273
+++ ChangeLog   18 May 2007 15:39:52 -0000      1.3274
@@ -59,6 +59,7 @@
          upsampling correctly
        * backend/sound_handler_sdl.cpp: Remove bug 19750 that garbled
          SOUNDSTREAM audio.
+       * server/swf/tag_loaders.cpp: Bug fix: calculate # samples correctly.
 
 2007-05-17  Rob Savoye  <address@hidden>