[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-192-g7a110fe

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  7a110fe81c2d181d247736e19e80750449f0f622 (commit)
      from  aa7f559e9a70d0bb85e377aaeeec93a1cbe651f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=7a110fe81c2d181d247736e19e80750449f0f622


commit 7a110fe81c2d181d247736e19e80750449f0f622
Author: Bastiaan Jacques <address@hidden>
Date:   Wed Mar 9 04:27:25 2011 +0100

    Don't stop playback until both audio and video have been fully consumed. 
Fixes bug #31806.

diff --git a/libcore/asobj/NetStream_as.cpp b/libcore/asobj/NetStream_as.cpp
index 2cd9269..1643c88 100644
--- a/libcore/asobj/NetStream_as.cpp
+++ b/libcore/asobj/NetStream_as.cpp
@@ -577,7 +577,8 @@ NetStream_as::getDecodedVideoFrame(boost::uint32_t ts)
             ts, parsingComplete);
 #endif 
 
-        if (parsingComplete) {
+        if (parsingComplete && m_parser->isBufferEmpty()) {
+
             decodingStatus(DEC_STOPPED);
 #ifdef GNASH_DEBUG_STATUS
             log_debug("getDecodedVideoFrame setting playStop status "
@@ -973,13 +974,15 @@ NetStream_as::pushDecodedAudioFrames(boost::uint32_t ts)
 
             if (parsingComplete) {
                 consumed = true;
-                decodingStatus(DEC_STOPPED);
+                if (m_parser->isBufferEmpty()) {
+                    decodingStatus(DEC_STOPPED);
 #ifdef GNASH_DEBUG_STATUS
-                log_debug("pushDecodedAudioFrames setting playStop status "
-                        "(parsing complete and nextAudioFrameTimestamp "
-                        "returned false)");
+                    log_debug("pushDecodedAudioFrames setting playStop status "
+                              "(parsing complete and nextAudioFrameTimestamp "
+                              "returned false)");
 #endif
-                setStatus(playStop);
+                    setStatus(playStop);
+                }
             }
 
             break;

-----------------------------------------------------------------------

Summary of changes:
 libcore/asobj/NetStream_as.cpp |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash