[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libbase/FLVParser.h server/asob...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog libbase/FLVParser.h server/asob... |
Date: |
Wed, 30 May 2007 12:48:22 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/05/30 12:48:21
Modified files:
. : ChangeLog
libbase : FLVParser.h
server/asobj : NetStreamFfmpeg.cpp NetStreamFfmpeg.h
Log message:
* libbase/FLVParser.h: document timestamp units for media frames
and isTimeLoaded().
* server/asobj/NetStreamFfmpeg.{cpp,h}: document units for time
members; (advance): fix isTimeLoaded() call, thanks Martin Guy
for noticing.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3409&r2=1.3410
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/FLVParser.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.38&r2=1.39
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3409
retrieving revision 1.3410
diff -u -b -r1.3409 -r1.3410
--- ChangeLog 30 May 2007 12:42:03 -0000 1.3409
+++ ChangeLog 30 May 2007 12:48:21 -0000 1.3410
@@ -6,6 +6,14 @@
2007-05-30 Sandro Santilli <address@hidden>
+ * libbase/FLVParser.h: document timestamp units for media frames
+ and isTimeLoaded().
+ * server/asobj/NetStreamFfmpeg.{cpp,h}: document units for time
+ members; (advance): fix isTimeLoaded() call, thanks Martin Guy
+ for noticing.
+
+2007-05-30 Sandro Santilli <address@hidden>
+
* libbase/FLVParser.{cpp,h}: drop setLoadThread method, require
a LoadThread to be passed on construction.
* server/asobj/NetConnection.{cpp,h}: drop connectParser, substitute
Index: libbase/FLVParser.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/FLVParser.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libbase/FLVParser.h 30 May 2007 12:18:49 -0000 1.12
+++ libbase/FLVParser.h 30 May 2007 12:48:21 -0000 1.13
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: FLVParser.h,v 1.12 2007/05/30 12:18:49 strk Exp $
+// $Id: FLVParser.h,v 1.13 2007/05/30 12:48:21 strk Exp $
// Information about the FLV format can be found at http://osflash.org/flv
@@ -127,6 +127,8 @@
uint16_t frameType;
uint32_t dataSize;
uint64_t dataPosition;
+
+ /// in milliseconds
uint32_t timestamp;
/// Return true if this video frame is a key frame
@@ -142,6 +144,8 @@
public:
uint32_t dataSize;
uint64_t dataPosition;
+
+ /// in milliseconds
uint32_t timestamp;
};
@@ -222,6 +226,9 @@
///
/// Locks the _mutex
///
+ /// @param time
+ /// Timestamp, in milliseconds.
+ ///
bool isTimeLoaded(uint32_t time);
/// \brief
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- server/asobj/NetStreamFfmpeg.cpp 30 May 2007 12:42:03 -0000 1.73
+++ server/asobj/NetStreamFfmpeg.cpp 30 May 2007 12:48:21 -0000 1.74
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamFfmpeg.cpp,v 1.73 2007/05/30 12:42:03 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.74 2007/05/30 12:48:21 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1215,7 +1215,7 @@
// miliseconds).
// 2) The buffer has be "starved" (not being filled as quickly as
needed),
// and we then wait until the buffer contains some data (1 sec)
again.
- if (m_go && m_pause && m_start_onbuffer && m_parser.get() &&
m_parser->isTimeLoaded(m_current_timestamp+m_bufferTime))
+ if (m_go && m_pause && m_start_onbuffer && m_parser.get() &&
m_parser->isTimeLoaded(uint32_t(m_current_timestamp*1000)+m_bufferTime))
{
log_debug("(advance): setting buffer full");
setStatus(bufferFull);
Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/asobj/NetStreamFfmpeg.h 30 May 2007 09:55:30 -0000 1.38
+++ server/asobj/NetStreamFfmpeg.h 30 May 2007 12:48:21 -0000 1.39
@@ -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.38 2007/05/30 09:55:30 strk Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.39 2007/05/30 12:48:21 strk Exp $ */
#ifndef __NETSTREAMFFMPEG_H__
#define __NETSTREAMFFMPEG_H__
@@ -314,29 +314,30 @@
//
boost::condition decode_wait;
- // The timestamp of the last decoded video frame
+ // The timestamp of the last decoded video frame, in seconds.
volatile double m_last_video_timestamp;
- // The timestamp of the last decoded audio frame
+ // The timestamp of the last decoded audio frame, in seconds.
volatile double m_last_audio_timestamp;
- // The timestamp of the last played audio (default) or video (if no
audio) frame
+ // The timestamp of the last played audio (default) or video (if no
audio) frame.
+ // Misured in seconds.
double m_current_timestamp;
// The queues of audio and video data.
multithread_queue <raw_mediadata_t*> m_qaudio;
multithread_queue <raw_mediadata_t*> m_qvideo;
- // The time we started playing
+ // The time we started playing in seconds (since VM start ?)
volatile double m_start_clock;
// When the queues are full, this is where we keep the audio/video frame
- // there wasen't room for on its queue
+ // there wasn't room for on its queue
raw_mediadata_t* m_unqueued_data;
ByteIOContext ByteIOCxt;
- // Time of when pause started
+ // Time of when pause started, in seconds since VM started
double m_time_of_pause;
};
- [Gnash-commit] gnash ChangeLog libbase/FLVParser.h server/asob...,
Sandro Santilli <=