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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/30 10:29:41

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

Log message:
                * server/asobj/NetStreamFfmpeg.cpp (decodeFLVFrame): Don't 
modify m_bufferTime
                  internally: should only be done on user request. (advance):
                  bufferFull condition is when parser loaded current+buffer 
time.
                  (av_streamer): add bufferTime/Length info in Decoding 
iteration
                  message - this shows that the playback is NOT waiting for 
bufferTime
                  to be reached before starting again (bug).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3404&r2=1.3405
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.68&r2=1.69

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3404
retrieving revision 1.3405
diff -u -b -r1.3404 -r1.3405
--- ChangeLog   30 May 2007 09:52:46 -0000      1.3404
+++ ChangeLog   30 May 2007 10:29:41 -0000      1.3405
@@ -1,5 +1,14 @@
 2007-05-30 Sandro Santilli <address@hidden>
 
+       * server/asobj/NetStreamFfmpeg.cpp (decodeFLVFrame): Don't modify 
m_bufferTime
+         internally: should only be done on user request. (advance):
+         bufferFull condition is when parser loaded current+buffer time.
+         (av_streamer): add bufferTime/Length info in Decoding iteration
+         message - this shows that the playback is NOT waiting for bufferTime
+         to be reached before starting again (bug).
+
+2007-05-30 Sandro Santilli <address@hidden>
+
        * libbase/FLVParser.{h,cpp}: document which methods lock and which
          not, add locking in getBufferLength().
        * server/asobj/NetStream.{h,cpp}: fix documentation for bufferLength

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- server/asobj/NetStreamFfmpeg.cpp    30 May 2007 09:06:57 -0000      1.68
+++ server/asobj/NetStreamFfmpeg.cpp    30 May 2007 10:29:41 -0000      1.69
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.68 2007/05/30 09:06:57 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.69 2007/05/30 10:29:41 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -645,7 +645,7 @@
        while (ns->m_go)
        {
 #ifdef GNASH_DEBUG_THREADS
-               log_debug("Decoding iteration");
+               log_debug("Decoding iteration. bufferTime=%lu, bufferLen=%lu", 
ns->bufferTime(), ns->bufferLength());
 #endif
 
                if (ns->m_isFLV) {
@@ -769,9 +769,7 @@
                        // Stop!
                        m_go = false;
                } else {
-                       // We pause and load and buffer a second before 
continuing.
                        pauseDecoding();
-                       m_bufferTime = 
static_cast<uint32_t>(m_current_timestamp) * 1000 + 1000;
                        setStatus(bufferEmpty);
                        m_start_onbuffer = true;
                }
@@ -1208,7 +1206,7 @@
        //    miliseconds).
        // 2) The buffer has be "starved" (not being filled as quickly as 
needed),
        //    and we then wait until the buffer contains some data (1 sec) 
again.
-       if (m_go && m_pause && m_start_onbuffer && m_parser.get() && 
m_parser->isTimeLoaded(m_bufferTime))
+       if (m_go && m_pause && m_start_onbuffer && m_parser.get() && 
m_parser->isTimeLoaded(m_current_timestamp+m_bufferTime))
        {
                log_debug("(advance): setting buffer full");
                setStatus(bufferFull);