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

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         gnash_0_8_3_branch
Changes by:     Bastiaan Jacques <bjacques>     08/05/21 09:15:12

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

Log message:
        Set playStop when playback stops and not when decoding stops.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.6573.2.30&r2=1.6573.2.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&only_with_tag=gnash_0_8_3_branch&r1=1.116.2.3&r2=1.116.2.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6573.2.30
retrieving revision 1.6573.2.31
diff -u -b -r1.6573.2.30 -r1.6573.2.31
--- ChangeLog   21 May 2008 08:50:02 -0000      1.6573.2.30
+++ ChangeLog   21 May 2008 09:15:08 -0000      1.6573.2.31
@@ -1,3 +1,8 @@
+2008-05-20 Bastiaan Jacques <address@hidden>
+
+       * server/asobj/NetStreamFfmpeg.cpp: Set playStop when playback stops
+       and not when decoding stops.
+
 2008-05-21 Sandro Santilli <address@hidden>
 
        * libbase/FLVParser.cpp (parseNextFrame): don't log ERROR on end of

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.116.2.3
retrieving revision 1.116.2.4
diff -u -b -r1.116.2.3 -r1.116.2.4
--- server/asobj/NetStreamFfmpeg.cpp    20 May 2008 08:02:54 -0000      
1.116.2.3
+++ server/asobj/NetStreamFfmpeg.cpp    21 May 2008 09:15:11 -0000      
1.116.2.4
@@ -763,16 +763,7 @@
 #ifdef GNASH_DEBUG_THREADS
        log_debug("Out of decoding loop");
 #endif
-
-#ifdef GNASH_DEBUG_STATUS
-       log_debug("Setting playStop status");
-#endif
-       // FIXME; this is most likely incorrect. This signals to AS that
-       // playback has stopped, which is incorrect. In reality, decoding
-       // has stopped, which should have no bearing on anything. So it would
-       // be better to test for EOF when no frames are available in advance().
-       // That said,this doesn't seem to break anything, so I'll leave it...
-       ns->setStatus(playStop);
+       ns->decodingStatus(DEC_STOPPED);
 }
 
 // audio callback is running in sound handler thread
@@ -832,7 +823,10 @@
                        log_debug("decodeFLVFrame: load completed, stopping");
 #endif
                        // Stop!
-                       decodingStatus(DEC_STOPPED);
+#ifdef GNASH_DEBUG_STATUS
+       log_debug("Setting playStop status");
+#endif
+                       setStatus(playStop);
                }
                else
                {