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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/21 17:35:44

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

Log message:
                * server/asobj/NetStreamFfmpeg.cpp (av_streamer):
                  Wait to be waked up when *any* (not both)
                  media frame buffer is full, or the actual
                  decoder would just do discard the product of work
                  done for an already full queue...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6671&r2=1.6672
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.130&r2=1.131

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6671
retrieving revision 1.6672
diff -u -b -r1.6671 -r1.6672
--- ChangeLog   21 May 2008 17:04:05 -0000      1.6671
+++ ChangeLog   21 May 2008 17:35:43 -0000      1.6672
@@ -1,5 +1,13 @@
 2008-05-21 Sandro Santilli <address@hidden>
 
+       * server/asobj/NetStreamFfmpeg.cpp (av_streamer):
+         Wait to be waked up when *any* (not both) 
+         media frame buffer is full, or the actual
+         decoder would just do discard the product of work
+         done for an already full queue...
+
+2008-05-21 Sandro Santilli <address@hidden>
+
        * libmedia/ffmpeg/ffmpegNetStreamUtil.h,
          server/asobj/NetStreamFfmpeg.cpp:
          Sorry, reverted previous patch, it consumed

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- server/asobj/NetStreamFfmpeg.cpp    21 May 2008 17:04:06 -0000      1.130
+++ server/asobj/NetStreamFfmpeg.cpp    21 May 2008 17:35:44 -0000      1.131
@@ -684,8 +684,10 @@
 
                if (ns->m_isFLV)
                {
-                       // If both queues are full then don't bother filling it
-                       if ( ns->m_qvideo.full() && ns->m_qaudio.full() )
+                       // If any of the two queues are full don't bother 
fetching more
+                       // (next consumer will wake us up)
+                       //
+                       if ( ns->m_qvideo.full() || ns->m_qaudio.full() )
                        {
                                ns->decodingStatus(DEC_DECODING); // that's to 
say: not buffering anymore