[Gnash-commit] gnash ChangeLog server/video_stream_instance.cp...

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/02/08 23:30:15

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

Log message:
        * server/video_stream_instance.cpp, server/parser/video_stream_def.cpp:
          Make sure current video really is from a VideoFrame tag, before 
trying to
          decode.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2280&r2=1.2281
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2280
retrieving revision 1.2281
diff -u -b -r1.2280 -r1.2281
--- ChangeLog   8 Feb 2007 22:20:43 -0000       1.2280
+++ ChangeLog   8 Feb 2007 23:30:15 -0000       1.2281
@@ -1,3 +1,9 @@
+2007-02-08 Tomas Groth Christensen <address@hidden>
+
+       * server/video_stream_instance.cpp, server/parser/video_stream_def.cpp:
+         Make sure current video really is from a VideoFrame tag, before 
trying to
+         decode.
+
 2007-02-08 Sandro Santilli <address@hidden>
 
        * testsuite/misc-ming.all/: Makefile.am, loadMovieTestRunner.cpp:
@@ -47,7 +53,7 @@
 
        * libbase/Makefile.am: Added embedVideoDecoder.h, 
          embedVideoDecoderFfmpeg.{h,cpp}
-       * libbase/embedVideoDecoderFfmpeg.{h,cpp} Added. Decoder for embedded 
video
+       * libbase/embedVideoDecoderFfmpeg.{h,cpp}: Added. Decoder for embedded 
video
          using ffmpeg.
        * server/impl.cpp: Added support for parsing swf embedded in a player 
(.exe)
        * server/asobj/NetStreamFfmpeg.{cpp,h}: Fixed some warnings.

Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/video_stream_instance.cpp    8 Feb 2007 13:25:41 -0000       1.8
+++ server/video_stream_instance.cpp    8 Feb 2007 23:30:15 -0000       1.9
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_instance.cpp,v 1.8 2007/02/08 13:25:41 tgc Exp $
+// $Id: video_stream_instance.cpp,v 1.9 2007/02/08 23:30:15 tgc Exp $
 
 #include "sprite_instance.h"
 #include "video_stream_instance.h"
@@ -75,6 +75,7 @@
        rect bounds(0.0f, 0.0f, PIXELS_TO_TWIPS(m_def->m_width), 
PIXELS_TO_TWIPS(m_def->m_height));
 
 
+       // If this is a video from a NetStream object, retrieve a video frame 
from there.
        if (_ns)
        {
                NetStream* nso = _ns;
@@ -87,9 +88,9 @@
                                gnash::render::drawVideoFrame(i, &m, &bounds);
                        }
                }
-       } else {
-               // If _ns is null, this must be a VideoFrame (embedded video)
 
+       // If this is a video from a VideoFrame tag, retrieve a video frame 
from there.
+       } else if (m_decoder) {
                uint8_t* data = 0;
                int size = 0;
                int current_frame = 
get_parent()->to_movie()->get_current_frame();

Index: server/parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/parser/video_stream_def.cpp  8 Feb 2007 14:40:20 -0000       1.3
+++ server/parser/video_stream_def.cpp  8 Feb 2007 23:30:15 -0000       1.4
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_def.cpp,v 1.3 2007/02/08 14:40:20 tgc Exp $
+// $Id: video_stream_def.cpp,v 1.4 2007/02/08 23:30:15 tgc Exp $
 
 #include "embedVideoDecoderFfmpeg.h"
 #include "video_stream_def.h"
@@ -110,10 +110,10 @@
 
 void 
 video_stream_definition::get_frame_data(int frameNum, uint8_t** data, int* 
size){
+       if (m_video_frames.size() == 0) return;
        int cur_frame = frameNum - m_start_frame;
        *size = m_video_frames_size[cur_frame];
        *data = m_video_frames[cur_frame];
-       if (data == NULL) printf("data is NULL\n");
 }
 
 }