[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-394-g17151c7

[Benjamin Wolsey]

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  17151c796073935bd63743283efe4c112fbe1ae7 (commit)
       via  4f30409be8f2093d606a4e6885918aab8db77088 (commit)
       via  ffdfe140241b36f2dee0c05f535e47cc59f06b3a (commit)
      from  a06bc2eb2a756d6e3b5b9e068cf70681c141b90d (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=17151c796073935bd63743283efe4c112fbe1ae7


commit 17151c796073935bd63743283efe4c112fbe1ae7
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Jul 1 13:10:43 2011 +0200

    Add some notes.

diff --git a/libcore/swf/StreamSoundBlockTag.cpp 
b/libcore/swf/StreamSoundBlockTag.cpp
index 409d056..ea230f7 100644
--- a/libcore/swf/StreamSoundBlockTag.cpp
+++ b/libcore/swf/StreamSoundBlockTag.cpp
@@ -118,6 +118,10 @@ StreamSoundBlockTag::loader(SWFStream& in, TagType tag, 
movie_definition& m,
     // for later "start playing from this frame" events.
     //
     // ownership of 'data' is transferred here
+    //
+    // TODO: the amount of sound data used should depend on the sampleCount,
+    // not on the size of the data. Currently the sound_handler ignores
+    // sampleCount completely.
     sound::sound_handler::StreamBlockId blockId =
         handler->addSoundBlock(data, dataLength, sampleCount, sId);
 
diff --git a/libsound/sound_handler.h b/libsound/sound_handler.h
index 575ed10..25bf27a 100644
--- a/libsound/sound_handler.h
+++ b/libsound/sound_handler.h
@@ -198,7 +198,13 @@ public:
 
     /// Start playback of a streaming sound, if not playing already
     //
-    ///
+    /// TODO: the samples count in the stream sound head (stored in a SoundInfo
+    /// object) should drive the timeline while a stream is playing.
+    //
+    /// TODO: only the number of samples advertised in each stream block should
+    /// be played for mp3 sounds, not the complete data! Currently we don't
+    /// store this value.
+    //
     /// @param streamId
     ///     Id of the sound buffer slot schedule playback of.
     ///     It is assumed to refer to a straming sound

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


commit 4f30409be8f2093d606a4e6885918aab8db77088
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Jul 1 09:42:42 2011 +0200

    Use sample count from mp3 data when available.
    
    "Use" is not really correct, as the sound_handler ignores it. But this
    value should take priority over the stream head value for the amount of
    samples actually played.

diff --git a/libcore/swf/StreamSoundBlockTag.cpp 
b/libcore/swf/StreamSoundBlockTag.cpp
index 32488f3..409d056 100644
--- a/libcore/swf/StreamSoundBlockTag.cpp
+++ b/libcore/swf/StreamSoundBlockTag.cpp
@@ -76,25 +76,25 @@ StreamSoundBlockTag::loader(SWFStream& in, TagType tag, 
movie_definition& m,
     }
 
     media::audioCodecType format = sinfo->getFormat();
-    unsigned int sampleCount = sinfo->getSampleCount();
+
+    boost::uint16_t sampleCount;
 
     // MP3 format blocks have additional info
     if (format == media::AUDIO_CODEC_MP3) {
         in.ensureBytes(4);
-        // FIXME: use these values !
-        const boost::uint16_t samplesCount = in.read_u16();
-        UNUSED(samplesCount);
+
+        // MP3 blocks have restrictions on the number of samples they can
+        // contain (due to the codec), so have a variable number of samples
+        // per block.
+        sampleCount = in.read_u16();
         const boost::uint16_t seekSamples = in.read_u16();
 
-        if (samplesCount) {
-            LOG_ONCE(log_unimpl(_("MP3 soundblock samples count (%s)"),
-                        samplesCount));
-        }
         if (seekSamples) {
             LOG_ONCE(log_unimpl(_("MP3 soundblock seek samples (%s)"),
                         seekSamples));
         }
     }
+    else sampleCount = sinfo->getSampleCount();
 
     const unsigned int dataLength = in.get_tag_end_position() - in.tell();
     if (!dataLength) {

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


commit ffdfe140241b36f2dee0c05f535e47cc59f06b3a
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Jul 1 08:59:23 2011 +0200

    Correct tests results.

diff --git a/testsuite/actionscript.all/MovieClip.as 
b/testsuite/actionscript.all/MovieClip.as
index 351772b..6e18535 100644
--- a/testsuite/actionscript.all/MovieClip.as
+++ b/testsuite/actionscript.all/MovieClip.as
@@ -119,15 +119,15 @@ endOfTest = function()
 #endif
 
 #if OUTPUT_VERSION == 6
-       check_totals(928); // SWF6
+       check_totals(927); // SWF6
 #endif
 
 #if OUTPUT_VERSION == 7
-       check_totals(961); // SWF7
+       check_totals(960); // SWF7
 #endif
 
 #if OUTPUT_VERSION >= 8
-       check_totals(1076); // SWF8+
+       check_totals(1077); // SWF8+
 #endif
 
        play();
@@ -569,9 +569,7 @@ check(mc3 != undefined);
 check_equals(mc3.getDepth(), 50);
 
 mc3.bd = Button.prototype.getDepth;
-check_equals(mc3.bd(), undefined);
-
-check(Button.prototype.getDepth != MovieClip.prototype.getDepth);
+check_equals(mc3.bd(), 50);
 
 #if OUTPUT_VERSION > 6 // {
 check_equals(getInstanceAtDepth(50), mc3);

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

Summary of changes:
 libcore/swf/StreamSoundBlockTag.cpp     |   20 ++++++++++++--------
 libsound/sound_handler.h                |    8 +++++++-
 testsuite/actionscript.all/MovieClip.as |   10 ++++------
 3 files changed, 23 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
Gnash