[Gnash-commit] gnash ChangeLog libbase/string_table.h server/p...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/09/17 12:41:22

Modified files:
        .              : ChangeLog 
        libbase        : string_table.h 
        server/parser  : video_stream_def.cpp video_stream_def.h 
        server/swf     : tag_loaders.cpp 

Log message:
                * libbase/string_table.h: Fixed compilation for non-32 bit 
platforms.
                * server/parser/video_stream_def.{cpp,h}: Use CapitalCase for 
types.
                * server/swf/tag_loaders.cpp: Also parse DelaySeek field for 
MP3 
                  in DEFINESOUND, fixes bug #21094.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4332&r2=1.4333
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/string_table.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.137&r2=1.138

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4332
retrieving revision 1.4333
diff -u -b -r1.4332 -r1.4333
--- ChangeLog   17 Sep 2007 12:21:46 -0000      1.4332
+++ ChangeLog   17 Sep 2007 12:41:21 -0000      1.4333
@@ -1,3 +1,13 @@
+2007-09-17 Tomas Groth Christensen <address@hidden>
+
+       * libbase/string_table.h: Fixed compilation for non-32 bit platforms.
+       * server/parser/video_stream_def.{cpp,h}: Use CapitalCase for types.
+
+2007-09-17 Lauri Mylläri <rez>
+
+       * server/swf/tag_loaders.cpp: Also parse DelaySeek field for MP3 
+         in DEFINESOUND, fixes bug #21094.
+
 2007-09-17 Sandro Santilli <address@hidden>
 
        * server/parser/movie_definition.h: changed signature of get_playlist:

Index: libbase/string_table.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/string_table.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libbase/string_table.h      16 Sep 2007 16:48:12 -0000      1.1
+++ libbase/string_table.h      17 Sep 2007 12:41:22 -0000      1.2
@@ -53,7 +53,7 @@
                        boost::multi_index::hashed_non_unique<
                                boost::multi_index::member<svt, std::string, 
&svt::mValue> >,
                        boost::multi_index::hashed_non_unique<
-                               boost::multi_index::member<svt, uint32_t, 
&svt::mId> > 
+                               boost::multi_index::member<svt, std::size_t, 
&svt::mId> > 
        > > table;
 
        typedef std::size_t key;

Index: server/parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/parser/video_stream_def.cpp  13 Sep 2007 20:54:42 -0000      1.16
+++ server/parser/video_stream_def.cpp  17 Sep 2007 12:41:22 -0000      1.17
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_def.cpp,v 1.16 2007/09/13 20:54:42 tgc Exp $
+// $Id: video_stream_def.cpp,v 1.17 2007/09/17 12:41:22 tgc Exp $
 
 #include "video_stream_def.h"
 #include "video_stream_instance.h"
@@ -94,7 +94,7 @@
                        data[i] = in->read_u8();
                }
 
-               m_video_frames[m->get_loading_frame()] = 
embedFrame(boost::shared_array<uint8_t>(data), size);
+               m_video_frames[m->get_loading_frame()] = 
EmbedFrame(boost::shared_array<uint8_t>(data), size);
        }
 
 }
@@ -138,7 +138,7 @@
 void 
 video_stream_definition::get_frame_data(int frameNum, uint8_t** data, int* 
size)
 {
-       embedFrameMap::iterator it = m_video_frames.find(frameNum);
+       EmbedFrameMap::iterator it = m_video_frames.find(frameNum);
        if( it != m_video_frames.end() )
        {
                *data = it->second.first.get();

Index: server/parser/video_stream_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/parser/video_stream_def.h    13 Sep 2007 20:54:42 -0000      1.10
+++ server/parser/video_stream_def.h    17 Sep 2007 12:41:22 -0000      1.11
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_def.h,v 1.10 2007/09/13 20:54:42 tgc Exp $
+// $Id: video_stream_def.h,v 1.11 2007/09/17 12:41:22 tgc Exp $
 
 #ifndef GNASH_VIDEO_STREAM_DEF_H
 #define GNASH_VIDEO_STREAM_DEF_H
@@ -162,9 +162,9 @@
        /// Elements of this map are owned by this instance, and will be 
deleted 
        /// at instance destruction time.
        ///
-       typedef std::pair< boost::shared_array<uint8_t>, uint32_t> embedFrame;
-       typedef std::map<uint32_t, embedFrame > embedFrameMap;
-       embedFrameMap m_video_frames;
+       typedef std::pair< boost::shared_array<uint8_t>, uint32_t> EmbedFrame;
+       typedef std::map<uint32_t, EmbedFrame > EmbedFrameMap;
+       EmbedFrameMap m_video_frames;
 
 };
 

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- server/swf/tag_loaders.cpp  10 Sep 2007 16:53:30 -0000      1.137
+++ server/swf/tag_loaders.cpp  17 Sep 2007 12:41:22 -0000      1.138
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.137 2007/09/10 16:53:30 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.138 2007/09/17 12:41:22 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1464,6 +1464,25 @@
 
        unsigned int    sample_count = in->read_u32();
 
+       if (format == sound_handler::FORMAT_MP3) {
+               in->ensureBytes(2);
+               int16_t delay_seek = in->read_s16();    // FIXME - not 
implemented/used
+               // The DelaySeek field has the following meaning:
+               // * If this value is positive, the player seeks this number of
+               //   samples into the sound block before the sound is played.
+               //   However, the seek is only performed if the player reached
+               //   the current frame via a GotoFrame action, otherwise no
+               //   seek is performed.
+               //
+               // * If this value is negative the player plays this number of
+               //   silent samples before playing the sound block. The player
+               //   behaves this way, regardless of how the current frame was
+               //   reached.
+               //
+               // quoted from
+               // 
http://www-lehre.informatik.uni-osnabrueck.de/~fbstark/diplom/docs/swf/Sounds.htm
+       }
+
        IF_VERBOSE_PARSE
        (
            log_parse(_("define sound: ch=%d, format=%d, "