[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libmedia/MediaParser.cpp
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog libmedia/MediaParser.cpp |
Date: |
Mon, 16 Jun 2008 16:30:50 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/06/16 16:30:50
Modified files:
. : ChangeLog
libmedia : MediaParser.cpp
Log message:
* libmedia/MediaParser.cpp: members initialization order, debugging
lines (commented out).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6946&r2=1.6947
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaParser.cpp?cvsroot=gnash&r1=1.5&r2=1.6
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6946
retrieving revision 1.6947
diff -u -b -r1.6946 -r1.6947
--- ChangeLog 16 Jun 2008 16:29:58 -0000 1.6946
+++ ChangeLog 16 Jun 2008 16:30:49 -0000 1.6947
@@ -2,6 +2,8 @@
* server/asobj/NetStreamFfmpeg.cpp (pushDecodedAudioFrames): don't
consume *all* of the audio queue if there's no sound handler..
+ * libmedia/MediaParser.cpp: members initialization order, debugging
+ lines (commented out).
2008-06-16 Benjamin Wolsey <address@hidden>
Index: libmedia/MediaParser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaParser.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/MediaParser.cpp 16 Jun 2008 11:16:11 -0000 1.5
+++ libmedia/MediaParser.cpp 16 Jun 2008 16:30:49 -0000 1.6
@@ -33,11 +33,11 @@
_stream(stream),
_parsingComplete(false),
_bufferTime(100), // 100 ms
- _seekRequest(false),
- _bytesLoaded(0),
_parserThread(0),
_parserThreadStartBarrier(2),
- _parserThreadKillRequested(false)
+ _parserThreadKillRequested(false),
+ _seekRequest(false),
+ _bytesLoaded(0)
{
}
@@ -88,7 +88,11 @@
MediaParser::videoBufferLength() const
{
if (_videoFrames.empty()) return 0;
- //log_debug("videoBufferLength: first video frame has timestamp %d",
_videoFrames.front()->timestamp());
+#if 0 // debugging
+ log_debug("videoBufferLength: %d - %d == %d",
+ _videoFrames.back()->timestamp(),
_videoFrames.front()->timestamp(),
+ _videoFrames.back()->timestamp() -
_videoFrames.front()->timestamp());
+#endif
return _videoFrames.back()->timestamp() -
_videoFrames.front()->timestamp();
}
@@ -96,7 +100,11 @@
MediaParser::audioBufferLength() const
{
if (_audioFrames.empty()) return 0;
- //log_debug("audioBufferLength: first audio frame has timestamp %d",
_audioFrames.front()->timestamp);
+#if 0 // debugging
+ log_debug("audioBufferLength: %d - %d == %d",
+ _audioFrames.back()->timestamp, _audioFrames.front()->timestamp,
+ _audioFrames.back()->timestamp -
_audioFrames.front()->timestamp);
+#endif
return _audioFrames.back()->timestamp -
_audioFrames.front()->timestamp;
}
@@ -266,6 +274,7 @@
_audioFrames.clear();
}
+ //log_debug("Pushing audio frame with timestamp %d", frame->timestamp);
_audioFrames.push_back(frame.release());
#ifdef LOAD_MEDIA_IN_A_SEPARATE_THREAD
waitIfNeeded(lock); // if the push reaches a "buffer full" condition,
wait to be waken up
@@ -297,6 +306,7 @@
_videoFrames.clear();
}
+ //log_debug("Pushing video frame with timestamp %d",
frame->timestamp());
_videoFrames.push_back(frame.release());
#ifdef LOAD_MEDIA_IN_A_SEPARATE_THREAD
waitIfNeeded(lock); // if the push reaches a "buffer full" condition,
wait to be waken up