[Gnash-commit] gnash ChangeLog server/parser/video_stream_def.cpp

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     08/02/20 15:54:59

Modified files:
        .              : ChangeLog 
        server/parser  : video_stream_def.cpp 

Log message:
                * server/parser/video_stream_def.cpp: Don't make a fuss about 
embedded
                video definitions without a real codec or video data, because 
they are
                frequently (or perhaps always) used as to place NetStream 
videos on 
                the stage.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5705&r2=1.5706
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&r1=1.38&r2=1.39

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5705
retrieving revision 1.5706
diff -u -b -r1.5705 -r1.5706
--- ChangeLog   20 Feb 2008 15:26:29 -0000      1.5705
+++ ChangeLog   20 Feb 2008 15:54:58 -0000      1.5706
@@ -1,3 +1,10 @@
+2008-02-20 Bastiaan Jacques <address@hidden>
+
+       * server/parser/video_stream_def.cpp: Don't make a fuss about embedded
+       video definitions without a real codec or video data, because they are
+       frequently (or perhaps always) used as to place NetStream videos on 
+       the stage.
+
 2008-02-20 Sandro Santilli <address@hidden>
 
        * server/: gnash.h, impl.cpp: add an additional optional

Index: server/parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/parser/video_stream_def.cpp  18 Feb 2008 22:25:19 -0000      1.38
+++ server/parser/video_stream_def.cpp  20 Feb 2008 15:54:59 -0000      1.39
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_def.cpp,v 1.38 2008/02/18 22:25:19 strk Exp $
+// $Id: video_stream_def.cpp,v 1.39 2008/02/20 15:54:59 bjacques Exp $
 
 #include "video_stream_def.h"
 #include "video_stream_instance.h"
@@ -79,6 +79,16 @@
 
        m_codec_id = static_cast<media::videoCodecType>(in->read_u8());
 
+       if (!m_codec_id) {
+               IF_VERBOSE_PARSE(
+               log_debug("An embedded video stream was created with a 0 Codec "
+                         "ID. This probably means the embedded video serves "
+                         "to place a NetStream video on the stage. Embedded "
+                         "video decoding will thus not take place.");
+               );
+               return;
+       }
+
        _decoder.reset( new media::VideoDecoderGst(m_codec_id, _width, _height) 
);
 
 }
@@ -138,6 +148,9 @@
 std::auto_ptr<image::image_base>
 video_stream_definition::get_frame_data(boost::uint32_t frameNum)
 {
+       if (_video_frames.empty()) {
+               return std::auto_ptr<image::image_base>();
+       }
        // Check if the requested frame holds any video data.
        EmbedFrameVec::iterator it = std::find_if(_video_frames.begin(),
          _video_frames.end(), boost::bind(has_frame_number, _1, frameNum));