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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/29 22:48:25

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

Log message:
                * server/asobj/NetStreamFfmpeg.{cpp,h}: don't lock
                  the mutex in seek() even, also intended to be called by
                  the VM..

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3397&r2=1.3398
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3397
retrieving revision 1.3398
diff -u -b -r1.3397 -r1.3398
--- ChangeLog   29 May 2007 21:38:34 -0000      1.3397
+++ ChangeLog   29 May 2007 22:48:24 -0000      1.3398
@@ -1,5 +1,11 @@
 2007-05-29 Sandro Santilli <address@hidden>
 
+       * server/asobj/NetStreamFfmpeg.{cpp,h}: don't lock
+         the mutex in seek() even, also intended to be called by
+         the VM..
+
+2007-05-29 Sandro Santilli <address@hidden>
+
        * server/asobj/NetStreamFfmpeg.{cpp,h}: Don't lock the mutex
          in pause(), play() and close(), all intended to be called
          by the locking advance(). More dox about locking in the header.

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- server/asobj/NetStreamFfmpeg.cpp    29 May 2007 21:38:35 -0000      1.66
+++ server/asobj/NetStreamFfmpeg.cpp    29 May 2007 22:48:25 -0000      1.67
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.66 2007/05/29 21:38:35 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.67 2007/05/29 22:48:25 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1019,10 +1019,6 @@
 void
 NetStreamFfmpeg::seek(double pos)
 {
-       log_debug("Thread %d locking on ::seek", pthread_self());
-       boost::mutex::scoped_lock  lock(decoding_mutex);
-       log_debug(" obtained (seek)");
-
        long newpos = 0;
        double timebase = 0;
 

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/asobj/NetStreamFfmpeg.h      29 May 2007 21:38:35 -0000      1.36
+++ server/asobj/NetStreamFfmpeg.h      29 May 2007 22:48:25 -0000      1.37
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.h,v 1.36 2007/05/29 21:38:35 strk Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.37 2007/05/29 22:48:25 strk Exp $ */
 
 #ifndef __NETSTREAMFFMPEG_H__
 #define __NETSTREAMFFMPEG_H__
@@ -199,7 +199,11 @@
        ///
        void play(const std::string& source);
 
-       /// Locks decoding_mutex
+       /// does NOT lock decoding_mutex. Users:
+       ///     - ::advance (VM), itself locking
+       ///     - ::startPlayback() non locking but called by av_streamer which 
locks
+       ///     - ::seekMedia() set as a callback with init_put_byte (??)
+       ///
        void seek(double pos);
 
        int64_t time();