[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libbase/FLVParser.cpp server/as...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog libbase/FLVParser.cpp server/as... |
Date: |
Thu, 31 May 2007 14:30:04 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/05/31 14:30:04
Modified files:
. : ChangeLog
libbase : FLVParser.cpp
server/asobj : NetStreamFfmpeg.cpp
Log message:
* libbase/FLVParser.cpp: protect seek debugging by
a GNASH_DEBUG_SEEK macro
* server/asobj/NetStreamFfmpeg.cpp: dont debug condition
variable signaling if GNASH_DEBUG_THREADS is undefined.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3422&r2=1.3423
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/FLVParser.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.77&r2=1.78
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3422
retrieving revision 1.3423
diff -u -b -r1.3422 -r1.3423
--- ChangeLog 31 May 2007 12:34:44 -0000 1.3422
+++ ChangeLog 31 May 2007 14:30:03 -0000 1.3423
@@ -1,5 +1,12 @@
2007-05-31 Sandro Santilli <address@hidden>
+ * libbase/FLVParser.cpp: protect seek debugging by
+ a GNASH_DEBUG_SEEK macro
+ * server/asobj/NetStreamFfmpeg.cpp: dont debug condition
+ variable signaling if GNASH_DEBUG_THREADS is undefined.
+
+2007-05-31 Sandro Santilli <address@hidden>
+
* libbase/log.{cpp,h}: lock the io Mutex on closeLog, to
prevent race conditions between a thread using log()
and one using closeLog().
Index: libbase/FLVParser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/FLVParser.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- libbase/FLVParser.cpp 31 May 2007 11:20:47 -0000 1.19
+++ libbase/FLVParser.cpp 31 May 2007 14:30:03 -0000 1.20
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: FLVParser.cpp,v 1.19 2007/05/31 11:20:47 tgc Exp $
+// $Id: FLVParser.cpp,v 1.20 2007/05/31 14:30:03 strk Exp $
#include "FLVParser.h"
#include "amf.h"
@@ -25,6 +25,8 @@
#define PADDING_BYTES 8
+// Define the following macro the have seek() operations printed
+//#define GNASH_DEBUG_SEEK 1
FLVParser::FLVParser(LoadThread& lt)
:
@@ -305,7 +307,9 @@
while ( bestFrame < _audioFrames.size()-1 &&
_audioFrames[bestFrame+1]->timestamp < time ) ++bestFrame;
}
+#ifdef GNASH_DEBUG_SEEK
gnash::log_debug("Seek (audio): " SIZET_FMT "/" SIZET_FMT " (%u/%u)",
bestFrame, numFrames, _audioFrames[bestFrame]->timestamp, time);
+#endif
_nextAudioFrame = bestFrame;
return _audioFrames[bestFrame]->timestamp;
@@ -411,7 +415,9 @@
else bestFrame = rewindKeyframe;
}
+#ifdef GNASH_DEBUG_SEEK
gnash::log_debug("Seek (video): " SIZET_FMT "/" SIZET_FMT " (%u/%u)",
bestFrame, numFrames, _videoFrames[bestFrame]->timestamp, time);
+#endif
_nextVideoFrame = bestFrame;
assert( _videoFrames[bestFrame]->isKeyFrame() );
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- server/asobj/NetStreamFfmpeg.cpp 31 May 2007 09:19:31 -0000 1.77
+++ server/asobj/NetStreamFfmpeg.cpp 31 May 2007 14:30:04 -0000 1.78
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamFfmpeg.cpp,v 1.77 2007/05/31 09:19:31 martinwguy Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.78 2007/05/31 14:30:04 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -111,7 +111,9 @@
{
// terminate thread
m_go = false;
+#ifdef GNASH_DEBUG_THREADS
log_debug("Waking up decoder thread on close()");
+#endif
decode_wait.notify_one();
// wait till thread is complete before main continues
@@ -731,7 +733,9 @@
// so that we don't suddenly run out.
if (ns->m_qaudio.size() < 3)
{
+#ifdef GNASH_DEBUG_THREADS
log_debug("Waking up decoder thread from audio_streamer
due to short qaudio size (%lu)", static_cast<unsigned
long>(ns->m_qaudio.size()));
+#endif
ns->decode_wait.notify_one();
}
@@ -1141,7 +1145,9 @@
// and decode some more.
if (!video)
{
+#ifdef GNASH_DEBUG_THREADS
log_debug("Waking up decoder thread from
refreshVideoFrame due to empty video queue");
+#endif
decode_wait.notify_one();
return;
}
@@ -1188,7 +1194,9 @@
// so that we don't suddenly run out.
if (m_qvideo.size() < 3)
{
+#ifdef GNASH_DEBUG_THREADS
log_debug("Waking up decoder thread from
refreshVideoFrame due short video queue (%lu)", static_cast<unsigned
long>(m_qvideo.size()));
+#endif
decode_wait.notify_one();
}
}
@@ -1277,7 +1285,9 @@
}
// Notify the decode thread/loop that we are running again
+#ifdef GNASH_DEBUG_THREADS
log_debug("Waking up decoder thread from unpauseDecoding...");
+#endif
decode_wait.notify_one();
// Re-connect to the soundhandler