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

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/05/16 16:37:27

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

Log message:
                * server/asobj/NetStreamGst.{h,cpp}: Splitted buildFLVPipeline
                  into buildFLVVideoPipeline and buildFLVSoundPipeline.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3241&r2=1.3242
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.h?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3241
retrieving revision 1.3242
diff -u -b -r1.3241 -r1.3242
--- ChangeLog   16 May 2007 16:13:05 -0000      1.3241
+++ ChangeLog   16 May 2007 16:37:26 -0000      1.3242
@@ -1,3 +1,8 @@
+2007-05-16 Tomas Groth Christensen <address@hidden>
+
+       * server/asobj/NetStreamGst.{h,cpp}: Splitted buildFLVPipeline
+         into buildFLVVideoPipeline and buildFLVSoundPipeline.
+
 2007-05-16 Sandro Santilli <address@hidden>
 
        * testsuite/misc-ming.all/: Makefile.am,

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/asobj/NetStreamGst.cpp       16 May 2007 16:30:25 -0000      1.43
+++ server/asobj/NetStreamGst.cpp       16 May 2007 16:37:26 -0000      1.44
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamGst.cpp,v 1.43 2007/05/16 16:30:25 strk Exp $ */
+/* $Id: NetStreamGst.cpp,v 1.44 2007/05/16 16:37:26 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -384,13 +384,12 @@
 
 
 bool
-NetStreamGst::buildFLVPipeline(bool* sound, bool* video)
+NetStreamGst::buildFLVVideoPipeline(bool* video)
 {
        log_debug("Building FLV decoding pipeline");
        FLVVideoInfo* videoInfo = m_parser->getVideoInfo();
 
        bool doVideo = *video;
-       bool doSound = *sound;
 
        if (videoInfo) {
                doVideo = true;
@@ -483,8 +482,17 @@
 
                g_object_set (G_OBJECT (videoinputcaps), "caps", videonincaps, 
NULL);
                gst_caps_unref (videonincaps);
-
        }
+       *video = doVideo;
+
+       return true;
+
+}
+
+bool
+NetStreamGst::buildFLVSoundPipeline(bool* sound)
+{
+       bool doSound = *sound;
 
        FLVAudioInfo* audioInfo = m_parser->getAudioInfo();
        if (!audioInfo) doSound = false;
@@ -546,7 +554,6 @@
        }
 
        *sound = doSound;
-       *video = doVideo;
 
        return true;
 }
@@ -633,7 +640,11 @@
        
        // Setup the decoder and source
        if (m_isFLV) {
-               if (!buildFLVPipeline(&sound, &video)) {
+               if (!buildFLVVideoPipeline(&video)) {
+                       unrefElements();
+                       return;
+               }
+               if (sound && !buildFLVSoundPipeline(&sound)) {
                        unrefElements();
                        return;
                }

Index: server/asobj/NetStreamGst.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/asobj/NetStreamGst.h 16 May 2007 16:08:12 -0000      1.20
+++ server/asobj/NetStreamGst.h 16 May 2007 16:37:27 -0000      1.21
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: */
+/* $Id: NetStreamGst.h,v 1.21 2007/05/16 16:37:27 tgc Exp $ */
 
 #ifndef __NETSTREAMGST_H__
 #define __NETSTREAMGST_H__
@@ -70,11 +70,17 @@
 
 private:
 
-       /// Creates the decoders and source elements for playing FLVs
+       /// Creates the sound decoder and source element for playing FLVs
        //
        /// @return true on success, false on failure
        ///
-       bool buildFLVPipeline(bool* sound, bool* video);
+       bool buildFLVSoundPipeline(bool* sound);
+
+       /// Creates the video decoder and source element for playing FLVs
+       //
+       /// @return true on success, false on failure
+       ///
+       bool buildFLVVideoPipeline(bool* video);
 
        /// Creates the decoder and source element for playing non-FLVs
        //