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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_8_1
Changes by:     Sandro Santilli <strk>  07/08/10 03:54:11

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

Log message:
                * server/swf/tag_loaders.cpp (sound_stream_block_loader): don't
                  discard the first 4 bytes if not reading an MP3. Makes ADPCM
                  sound better for the feed.swf case (but ADPCM decoder needs
                  lot more work to be correct)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.6&r2=1.3971.2.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.123.2.3&r2=1.123.2.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.6
retrieving revision 1.3971.2.7
diff -u -b -r1.3971.2.6 -r1.3971.2.7
--- ChangeLog   9 Aug 2007 23:31:05 -0000       1.3971.2.6
+++ ChangeLog   10 Aug 2007 03:54:10 -0000      1.3971.2.7
@@ -1,5 +1,12 @@
 2007-08-09 Sandro Santilli <address@hidden>
 
+       * server/swf/tag_loaders.cpp (sound_stream_block_loader): don't
+         discard the first 4 bytes if not reading an MP3. Makes ADPCM
+         sound better for the feed.swf case (but ADPCM decoder needs
+         lot more work to be correct)
+
+2007-08-09 Sandro Santilli <address@hidden>
+
        * server/FreetypeGlyphsProvider.cpp (getGlyph): don't abort if
          FT_Load_Char doesn't return an outline glyph, rather print
          an UNIMPLEMENTED message and the type of glyph you got.

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.123.2.3
retrieving revision 1.123.2.4
diff -u -b -r1.123.2.3 -r1.123.2.4
--- server/swf/tag_loaders.cpp  9 Aug 2007 23:24:37 -0000       1.123.2.3
+++ server/swf/tag_loaders.cpp  10 Aug 2007 03:54:11 -0000      1.123.2.4
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.123.2.3 2007/08/09 23:24:37 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.123.2.4 2007/08/10 03:54:11 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1543,8 +1543,10 @@
 
     assert(tag == SWF::SOUNDSTREAMBLOCK); // 19
 
-    // discard garbage data
-    in->skip_bytes(4);
+    // discard garbage data (MP3 only)
+    // TODO: stop using statics (stream_input_format) for stream sounds..
+    //       tgc should be working on this
+    if ( stream_input_format == sound_handler::FORMAT_MP3) in->skip_bytes(4);
 
     // If we don't have a sound_handler registered stop here
     if (!handler) return;