[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1650-g3c5a05d

[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  3c5a05da07d3856965e8478cfae9a4f9b8044d43 (commit)
       via  b3a73eb80e381079b212dc3c8b9b221ac20fd529 (commit)
      from  6f3809eac5220000c16f8768e81cda6a3c23382f (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=3c5a05da07d3856965e8478cfae9a4f9b8044d43


commit 3c5a05da07d3856965e8478cfae9a4f9b8044d43
Author: Bastiaan Jacques <address@hidden>
Date:   Tue Jul 9 18:46:07 2013 +0200

    Revert "Savannah #33760: Don't insist that the sound is completely parsed 
before starting to consume audio."
    
    This reverts commit 953e044ebe92c80406f7fc655dd45dceef6f1ae4.
    
    This commit does the wrong thing, because onLoad should not be called until 
the whole sound is parsed.

diff --git a/libcore/asobj/Sound_as.cpp b/libcore/asobj/Sound_as.cpp
index d749402..0ffe7d0 100644
--- a/libcore/asobj/Sound_as.cpp
+++ b/libcore/asobj/Sound_as.cpp
@@ -372,7 +372,7 @@ Sound_as::probeAudio()
 #ifdef GNASH_DEBUG_SOUND_AS
         log_debug("Probing audio for load");
 #endif
-        if (_mediaParser->parsingCompleted() || _mediaParser->bufferFull()) {
+        if (_mediaParser->parsingCompleted()) {
 
             _soundLoaded = true;
 
diff --git a/libmedia/FLVParser.cpp b/libmedia/FLVParser.cpp
index 8ffe0c1..8210e34 100644
--- a/libmedia/FLVParser.cpp
+++ b/libmedia/FLVParser.cpp
@@ -124,7 +124,7 @@ FLVParser::seek(boost::uint32_t& time)
 bool
 FLVParser::parseNextChunk()
 {
-       bool indexOnly = bufferFullInternal(); // won't lock, but our caller 
locked...
+       bool indexOnly = bufferFull(); // won't lock, but our caller locked...
        return parseNextTag(indexOnly);
 }
 
diff --git a/libmedia/MediaParser.cpp b/libmedia/MediaParser.cpp
index fbba4f1..77eb5d6 100644
--- a/libmedia/MediaParser.cpp
+++ b/libmedia/MediaParser.cpp
@@ -407,7 +407,7 @@ MediaParser::waitIfNeeded(boost::mutex::scoped_lock& lock)
        //  We hold a lock on the queue here...
        bool pc=parsingCompleted();
        bool ic=indexingCompleted();
-       bool bf=bufferFullInternal();
+       bool bf=bufferFull();
        if (( pc || (bf && ic)) && !parserThreadKillRequested()) // TODO: or 
seekRequested ?
        {
 #ifdef GNASH_DEBUG_MEDIAPARSER
@@ -421,13 +421,13 @@ MediaParser::waitIfNeeded(boost::mutex::scoped_lock& lock)
 }
 
 bool
-MediaParser::bufferFullInternal() const
+MediaParser::bufferFull() const
 {
        // Callers are expected to hold a lock on _qMutex
        int bl = getBufferLengthNoLock();
        int bt = getBufferTime();
 #ifdef GNASH_DEBUG_MEDIAPARSER
-       log_debug("MediaParser::bufferFullInternal: %d/%d", bl, bt);
+       log_debug("MediaParser::bufferFull: %d/%d", bl, bt);
 #endif // GNASH_DEBUG_MEDIAPARSER
        return bl > bt;
 }
diff --git a/libmedia/MediaParser.h b/libmedia/MediaParser.h
index 473b5ae..535dd78 100644
--- a/libmedia/MediaParser.h
+++ b/libmedia/MediaParser.h
@@ -567,12 +567,6 @@ public:
        ///
        bool parsingCompleted() const { return _parsingComplete; }
 
-       /// @ret true if the buffer (configured by setBufferTime) is full.
-       bool bufferFull() {
-           boost::mutex::scoped_lock lock(_qMutex);
-           return bufferFullInternal();
-       }
-
        /// Return true of indexing is completed
        //
        /// If this function returns false, parseNextChunk will
@@ -720,7 +714,7 @@ protected:
        /// is passed a locked lock on _qMutex, and by parseNextChunk
        /// to determine whether to index-only or also push on queue.
        ///
-       bool bufferFullInternal() const;
+       bool bufferFull() const;
 
        /// On seek, this flag will be set, while holding a lock on 
_streamMutex.
        /// The parser, when obtained a lock on _streamMutex, will check this
diff --git a/testsuite/actionscript.all/Sound.as 
b/testsuite/actionscript.all/Sound.as
index bd9f412..f50e645 100644
--- a/testsuite/actionscript.all/Sound.as
+++ b/testsuite/actionscript.all/Sound.as
@@ -28,7 +28,7 @@ rcsid="Sound.as";
 endOfTest = function()
 {
 #if OUTPUT_VERSION > 5
-    check_totals(112);
+    xcheck_totals(112);
 #else
     check_totals(94);
 #endif

http://git.savannah.gnu.org/cgit//commit/?id=b3a73eb80e381079b212dc3c8b9b221ac20fd529


commit b3a73eb80e381079b212dc3c8b9b221ac20fd529
Author: Bastiaan Jacques <address@hidden>
Date:   Tue Jul 9 18:45:57 2013 +0200

    Revert "DSOEXPORT bufferFullInternal"
    
    This reverts commit 6f3809eac5220000c16f8768e81cda6a3c23382f.

diff --git a/libmedia/MediaParser.h b/libmedia/MediaParser.h
index ca68414..473b5ae 100644
--- a/libmedia/MediaParser.h
+++ b/libmedia/MediaParser.h
@@ -720,7 +720,7 @@ protected:
        /// is passed a locked lock on _qMutex, and by parseNextChunk
        /// to determine whether to index-only or also push on queue.
        ///
-       DSOEXPORT bool bufferFullInternal() const;
+       bool bufferFullInternal() const;
 
        /// On seek, this flag will be set, while holding a lock on 
_streamMutex.
        /// The parser, when obtained a lock on _streamMutex, will check this

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

Summary of changes:
 libcore/asobj/Sound_as.cpp          |    2 +-
 libmedia/FLVParser.cpp              |    2 +-
 libmedia/MediaParser.cpp            |    6 +++---
 libmedia/MediaParser.h              |    8 +-------
 testsuite/actionscript.all/Sound.as |    2 +-
 5 files changed, 7 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Gnash