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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/06/16 16:29:58

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

Log message:
                * server/asobj/NetStreamFfmpeg.cpp (pushDecodedAudioFrames): 
don't
                  consume *all* of the audio queue if there's no sound handler..

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6945&r2=1.6946
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.151&r2=1.152

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6945
retrieving revision 1.6946
diff -u -b -r1.6945 -r1.6946
--- ChangeLog   16 Jun 2008 16:24:02 -0000      1.6945
+++ ChangeLog   16 Jun 2008 16:29:58 -0000      1.6946
@@ -1,3 +1,8 @@
+2008-06-16 Sandro Santilli <address@hidden>
+
+       * server/asobj/NetStreamFfmpeg.cpp (pushDecodedAudioFrames): don't
+         consume *all* of the audio queue if there's no sound handler..
+
 2008-06-16 Benjamin Wolsey <address@hidden>
 
        * server/asobj/System.cpp, server/video_stream_instance.cpp: remove

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -b -r1.151 -r1.152
--- server/asobj/NetStreamFfmpeg.cpp    16 Jun 2008 09:05:02 -0000      1.151
+++ server/asobj/NetStreamFfmpeg.cpp    16 Jun 2008 16:29:58 -0000      1.152
@@ -603,16 +603,6 @@
        // nothing to do if we don't have an audio decoder
        if ( ! _audioDecoder.get() ) return;
 
-       // just flush any pending audio frame if we're
-       // not willing to play sounds anyway
-       if ( ! _soundHandler )
-       {
-               while ( media::raw_mediadata_t* audio = decodeNextAudioFrame() )
-                       delete audio;
-               _playHead.setAudioConsumed();
-               return;
-       }
-
        bool consumed = false;
 
        boost::uint64_t nextTimestamp;
@@ -757,9 +747,17 @@
                // be take note about how many things we're pushing over
                log_debug("pushDecodedAudioFrames(%d) pushing %dth frame with 
timestamp %d", ts, _audioQueue.size()+1, nextTimestamp); 
 #endif
+
+               if ( _soundHandler )
+               {
                _audioQueue.push_back(audio);
                _audioQueueSize += audio->m_size;
        }
+               else // don't bother pushing audio to the queue, nobody would 
consume it...
+               {
+                       delete audio;
+               }
+       }
 
        // If we consumed audio of current position, feel free to advance if 
needed,
        // resuming playbackClock too..