[Gnash-commit] gnash ChangeLog server/asobj/NetStreamGst.cpp

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/03/28 22:21:29

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStreamGst.cpp 

Log message:
                * server/asobj/NetStreamGst.cpp: Make sure pipeline exists 
before
                  accessing it, and the same goes for the FLV parser.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2706&r2=1.2707
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2706
retrieving revision 1.2707
diff -u -b -r1.2706 -r1.2707
--- ChangeLog   28 Mar 2007 20:52:37 -0000      1.2706
+++ ChangeLog   28 Mar 2007 22:21:29 -0000      1.2707
@@ -1,3 +1,8 @@
+2007-03-28 Tomas Groth Christensen <address@hidden>
+
+       * server/asobj/NetStreamGst.cpp: Make sure pipeline exists before
+         accessing it, and the same goes for the FLV parser.
+
 2007-03-28 Sandro Santilli <address@hidden>
 
        * server/sprite_instance.cpp (add_textfield): return void.

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/NetStreamGst.cpp       28 Mar 2007 16:12:08 -0000      1.16
+++ server/asobj/NetStreamGst.cpp       28 Mar 2007 22:21:29 -0000      1.17
@@ -85,7 +85,8 @@
        inputPos(0),
        videowidth(0),
        videoheight(0),
-       m_newFrameReady(false)
+       m_newFrameReady(false),
+       m_parser(NULL)
 {
 }
 
@@ -494,6 +495,18 @@
        g_object_set (G_OBJECT (ns->videosink), "signal-handoffs", TRUE, 
"sync", TRUE, NULL);
        g_signal_connect (ns->videosink, "handoff", G_CALLBACK 
(NetStreamGst::callback_output), ns);
 
+       if (ns->m_isFLV) {
+               if (!ns->videodecoder || !ns->videosource || 
!ns->videoinputcaps || !ns->audiodecoder || !ns->audiosource || 
!ns->audioinputcaps) {
+                       gnash::log_error("Gstreamer element(s) for video movie 
handling could not be created\n");
+                       return;
+               }
+       } else {
+               if (!ns->decoder || !ns->source) {
+                       gnash::log_error("Gstreamer element(s) for video movie 
handling could not be created\n");
+                       return;
+               }
+       }
+
        if (!ns->colorspace || !ns->videocaps || !ns->videorate || 
!ns->videosink) {
                gnash::log_error("Gstreamer element(s) for video movie handling 
could not be created\n");
                return;
@@ -539,6 +552,8 @@
 NetStreamGst::seek(double pos)
 {
 
+       if (!pipeline) return;
+
        if (m_isFLV) {
                uint32_t newpos = 
m_parser->seek(static_cast<uint32_t>(pos*1000))/1000;
                /*if (!gst_element_seek (pipeline, 1.0, GST_FORMAT_TIME, 
GST_SEEK_FLAG_FLUSH,