[Gnash-commit] gnash ChangeLog libbase/FLVParser.h server/asob...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/06/04 12:02:16

Modified files:
        .              : ChangeLog 
        libbase        : FLVParser.h 
        server/asobj   : NetStreamFfmpeg.h 

Log message:
                * libbase/FLVParser.h: updated dox for nextAudioFrame() and
                  nextVideoFrame() noting the non-blocking nature of the calls;
                  add a parsingCompleted() method.
                * server/asobj/NetStreamFfmpeg.h: update documentation of
                  decodeFLVFrame()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3445&r2=1.3446
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/FLVParser.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.45&r2=1.46

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3445
retrieving revision 1.3446
diff -u -b -r1.3445 -r1.3446
--- ChangeLog   4 Jun 2007 09:15:40 -0000       1.3445
+++ ChangeLog   4 Jun 2007 12:02:15 -0000       1.3446
@@ -1,5 +1,13 @@
 2007-06-04 Sandro Santilli <address@hidden>
 
+       * libbase/FLVParser.h: updated dox for nextAudioFrame() and
+         nextVideoFrame() noting the non-blocking nature of the calls;
+         add a parsingCompleted() method.
+       * server/asobj/NetStreamFfmpeg.h: update documentation of
+         decodeFLVFrame()
+
+2007-06-04 Sandro Santilli <address@hidden>
+
        * libbase/FLVParser.{cpp,h}: put FLVParser in the gnash namespace.
 
 2007-06-04 Sandro Santilli <address@hidden>

Index: libbase/FLVParser.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/FLVParser.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libbase/FLVParser.h 4 Jun 2007 09:15:41 -0000       1.14
+++ libbase/FLVParser.h 4 Jun 2007 12:02:15 -0000       1.15
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: FLVParser.h,v 1.14 2007/06/04 09:15:41 strk Exp $
+// $Id: FLVParser.h,v 1.15 2007/06/04 12:02:15 strk Exp $
 
 // Information about the FLV format can be found at http://osflash.org/flv
 
@@ -189,23 +189,36 @@
        FLVFrame* nextMediaFrame();
 
        /// \brief
-       /// Returns the next audio frame in the timeline. If no frame has been
-       /// played before the first frame is returned. If there is no more 
frames
-       /// in the timeline NULL is returned.
+       /// Returns the next audio frame in the parsed buffer.
        //
+       /// If no frame has been played before the first frame is returned.
+       /// If there is no more frames in the parsed buffer NULL is returned,
+       /// you can check with parsingCompleted() to know wheter this is due to 
+       /// EOF reached.
+       ///
        /// Locks the _mutex
        ///
        FLVFrame* nextAudioFrame();
 
        /// \brief
-       /// Returns the next video frame in the timeline. If no frame has been
-       /// played before the first frame is returned. If there is no more 
frames
-       /// in the timeline NULL is returned.
+       /// Returns the next video frame in the parsed buffer.
        //
+       /// If no frame has been played before the first frame is returned.
+       /// If there is no more frames in the parsed buffer NULL is returned.
+       /// you can check with parsingCompleted() to know wheter this is due to 
+       /// EOF reached.
+       ///
        /// Locks the _mutex
        ///
        FLVFrame* nextVideoFrame();
 
+       /// Return true of parsing is completed
+       //
+       /// If this function returns true, any call to nextVideoFrame() or 
nextAudioFrame
+       /// will always return NULL
+       ///
+       bool parsingCompleted() const { return _parsingComplete; }
+
        /// Returns a FLVVideoInfo class about the videostream
        //
        /// Locks the _mutex

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/asobj/NetStreamFfmpeg.h      4 Jun 2007 09:04:32 -0000       1.45
+++ server/asobj/NetStreamFfmpeg.h      4 Jun 2007 12:02:16 -0000       1.46
@@ -15,7 +15,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: NetStreamFfmpeg.h,v 1.45 2007/06/04 09:04:32 strk Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.46 2007/06/04 12:02:16 strk Exp $ */
 
 #ifndef __NETSTREAMFFMPEG_H__
 #define __NETSTREAMFFMPEG_H__
@@ -314,10 +314,18 @@
        // Used to decode and push the next available (non-FLV) frame to the 
audio or video queue
        bool decodeMediaFrame();
 
-       // Used to decode push the next available FLV frame to the audio or 
video queue
-       //
-       // Uses by ::advance().
+       /// Used to decode push the next available FLV frame to the audio or 
video queue
        //
+       /// Called by ::av_streamer to buffer more a/v frames when possible.
+       ///
+       /// This is a non-blocking call, if data isn't available in the parser 
no
+       /// new frame is decoded and this method returns false. Note that this 
doesn't
+       /// necessarely means the FLV stream is ended, rather it is possible 
the loader
+       /// thread is starving. 
+       ///
+       /// TODO: return a more informative value to distinguish between EOF 
and starving
+       ///       conditions ?
+       ///
        bool decodeFLVFrame();
 
        // Used to decode a video frame and push it on the videoqueue