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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/12 08:58:05

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

Log message:
        cache sound_handler pointer as class member (to reduce function calls).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6586&r2=1.6587
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.60&r2=1.61

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6586
retrieving revision 1.6587
diff -u -b -r1.6586 -r1.6587
--- ChangeLog   12 May 2008 08:33:14 -0000      1.6586
+++ ChangeLog   12 May 2008 08:58:04 -0000      1.6587
@@ -1,5 +1,10 @@
 2008-05-12 Sandro Santilli <address@hidden>
 
+       * server/asobj/NetStreamFfmpeg.{cpp,h}: cache sound_handler pointer
+         as class member (to reduce function calls).
+
+2008-05-12 Sandro Santilli <address@hidden>
+
        * libbase/FLVParser.{cpp,h}: keep audio/video stream info object
          by auto_ptr, fixing a memory leak. Have getVideoInfo/getAudioInfo
          NOT transfer ownership, avoiding useless memory copies. Document

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- server/asobj/NetStreamFfmpeg.cpp    12 May 2008 08:33:15 -0000      1.119
+++ server/asobj/NetStreamFfmpeg.cpp    12 May 2008 08:58:04 -0000      1.120
@@ -79,7 +79,8 @@
        m_unqueued_data(NULL),
        m_time_of_pause(0),
 
-       _decoderBuffer(0)
+       _decoderBuffer(0),
+       _soundHandler(get_sound_handler())
 {
 
        ByteIOCxt.buffer = NULL;
@@ -137,10 +138,9 @@
 
        // When closing gnash before playback is finished, the soundhandler 
        // seems to be removed before netstream is destroyed.
-       media::sound_handler* s = get_sound_handler();
-       if (s != NULL)
+       if (_soundHandler)
        {
-               s->detach_aux_streamer(this);
+               _soundHandler->detach_aux_streamer(this);
        }
 
        if (m_Frame) av_free(m_Frame);
@@ -584,8 +584,7 @@
 
        }
 
-       media::sound_handler* s = get_sound_handler();
-       if (m_audio_index >= 0 && s != NULL)
+       if ( m_audio_index >= 0 && _soundHandler )
        {
                // Get a pointer to the audio codec context for the video stream
                m_ACodecCtx = m_FormatCtx->streams[m_audio_index]->codec;
@@ -660,10 +659,9 @@
        else
        {
                // We need to restart the audio
-               media::sound_handler* s = get_sound_handler();
-               if (s)
+               if (_soundHandler)
                {
-                       s->attach_aux_streamer(audio_streamer, ns);
+                       _soundHandler->attach_aux_streamer(audio_streamer, ns);
                }
        }
 
@@ -1093,8 +1091,7 @@
        {
                if (m_unqueued_data->m_stream_index == m_audio_index)
                {
-                       media::sound_handler* s = get_sound_handler();
-                       if (s)
+                       if (_soundHandler)
                        {
                                m_unqueued_data = 
m_qaudio.push(m_unqueued_data) ? NULL : m_unqueued_data;
                        }
@@ -1390,8 +1387,7 @@
 
        // Re-connect to the soundhandler.
        // It was disconnected to avoid to keep playing sound while paused
-       media::sound_handler* s = get_sound_handler();
-       if ( s )     s->attach_aux_streamer(audio_streamer, (void*) this);
+       if ( _soundHandler ) _soundHandler->attach_aux_streamer(audio_streamer, 
(void*) this);
 }
 
 

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- server/asobj/NetStreamFfmpeg.h      9 May 2008 10:03:25 -0000       1.60
+++ server/asobj/NetStreamFfmpeg.h      12 May 2008 08:58:05 -0000      1.61
@@ -214,6 +214,9 @@
 
        // Decoder buffer
        boost::uint8_t* _decoderBuffer;
+
+       // Current sound handler
+       media::sound_handler* _soundHandler;
 };