OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr

Android-x86
Fork
Faire un don

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

external-opencore: Commit

external/opencore


Commit MetaInfo

Révisionc3c4aabb81f27f2f56d4a2f2187f00049f1e1c27 (tree)
l'heure2010-04-16 05:34:34
AuteurPacketVideo CM <engbuild@pv.c...>
CommiterPacketVideo CM

Message de Log

RIO-8699: Updating out-of-order packets handling logic

Change-Id: Idc5dc345d05bef87b1beabea277c9f9633556ac7

Change Summary

Modification

--- a/engines/2way/src/pv_2way_sdkinfo.h
+++ b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
2121 // This header file is automatically generated at build-time
2222 // *** OFFICIAL RELEASE INFO -- Will not auto update
2323
24-#define PV2WAY_ENGINE_SDKINFO_LABEL "1367151"
25-#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100408
24+#define PV2WAY_ENGINE_SDKINFO_LABEL "1369443"
25+#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100409
2626
2727 #endif //PV_2WAY_SDKINFO_H_INCLUDED
--- a/engines/author/src/pv_author_sdkinfo.h
+++ b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
2121 // This header file is automatically generated at build-time
2222 // *** OFFICIAL RELEASE INFO -- Will not auto update
2323
24-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1367151"
25-#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100408
24+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1369443"
25+#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100409
2626
2727 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED
--- a/engines/player/src/pv_player_sdkinfo.h
+++ b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
2121 // This header file is automatically generated at build-time
2222 // *** OFFICIAL RELEASE INFO -- Will not auto update
2323
24-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1367151"
25-#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100408
24+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1369443"
25+#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100409
2626
2727 #endif //PV_PLAYER_SDKINFO_H_INCLUDED
--- a/nodes/streaming/jitterbuffernode/jitterbuffer/common/src/pvmf_jitter_buffer_impl.cpp
+++ b/nodes/streaming/jitterbuffernode/jitterbuffer/common/src/pvmf_jitter_buffer_impl.cpp
@@ -955,7 +955,7 @@ OSCL_EXPORT_REF bool PVMFJitterBufferImpl::RequestEventCallBack(JB_NOTIFY_CALLBA
955955 {
956956 case JB_NOTIFY_WAIT_FOR_OOO_PACKET_COMPLETE :
957957 {
958- PVMFJBEventNotificationRequestInfo eventRequestInfo(CLOCK_NOTIFICATION_INTF_TYPE_ESTIMATEDSERVER, this, NULL);
958+ PVMFJBEventNotificationRequestInfo eventRequestInfo(CLOCK_NOTIFICATION_INTF_TYPE_CLIENTPLAYBACK, this, NULL);
959959 retval = irJBEventNotifier.RequestCallBack(eventRequestInfo, aDelay, iWaitForOOOPacketCallBkId);
960960 if (retval)
961961 {
--- a/nodes/streaming/jitterbuffernode/jitterbuffer/rtp/src/pvmf_rtp_jitter_buffer_impl.cpp
+++ b/nodes/streaming/jitterbuffernode/jitterbuffer/rtp/src/pvmf_rtp_jitter_buffer_impl.cpp
@@ -47,6 +47,7 @@ OSCL_DLL_ENTRY_POINT_DEFAULT()
4747 const uint16 RTPSEQNUM_ROLLOVER_WRAP_THRESHHOLD_16BIT = 0x8000;
4848
4949 const int32 iEstimatedServerKeepAheadInMilliSeconds = 2000;
50+const int32 OOO_DATAPATH_DELAY_FACTOR = 500;
5051
5152 /* RTP HEADER CONSTANTS */
5253 #define SUPPORTED_RTP_HEADER_VERSION 2
@@ -1081,12 +1082,12 @@ bool PVMFRTPJitterBufferImpl::CanRetrievePacket()
10811082 overflowFlag = false;
10821083 irEstimatedServerClock.GetCurrentTime32(estimatedServClock, overflowFlag, PVMF_MEDIA_CLOCK_MSEC);
10831084 uint32 delta = 0;
1084- if (!iEOSSignalled && (PVTimeComparisonUtils::IsEarlier(estimatedServClock, converted_ts + iEstimatedServerKeepAheadInMilliSeconds, delta) && (delta > 0)))
1085+ if (!iEOSSignalled && (PVTimeComparisonUtils::IsEarlier(clientClock + OOO_DATAPATH_DELAY_FACTOR, converted_ts, delta) && (delta > 0)))
10851086 {
10861087 //hold the available data packet, and wait for hole in the JB due to OOO packet to be filled
10871088 if (!IsCallbackPending(JB_NOTIFY_WAIT_FOR_OOO_PACKET_COMPLETE, NULL))
10881089 {
1089- PVMF_JB_LOGDATATRAFFIC_OUT((0, "PVMFJitterBufferNode::SendData Detected Hole in JB PeekTs[%d] clientClock[%d] , ClientClockState [%d], estimatedServClock[%d], EstimatedServClockState[%d], oSessionDurationExpired[%d] MimeStr[%s]", converted_ts, clientClock, irClientPlayBackClock.GetState(), estimatedServClock, irEstimatedServerClock.GetState(), iEOSSignalled, irMimeType.get_cstr()));
1090+ PVMF_JB_LOGDATATRAFFIC_OUT((0, "PVMFJitterBufferNode::SendData Detected Hole in JB PeekTs[%d] clientClock[%d] , ClientClockState [%d], estimatedServClock[%d], EstimatedServClockState[%d], oSessionDurationExpired[%d] MimeStr[%s], delta[%d]", converted_ts, clientClock, irClientPlayBackClock.GetState(), estimatedServClock, irEstimatedServerClock.GetState(), iEOSSignalled, irMimeType.get_cstr(), delta));
10901091 RequestEventCallBack(JB_NOTIFY_WAIT_FOR_OOO_PACKET_COMPLETE , delta, NULL);
10911092 }
10921093 return false;
@@ -1171,13 +1172,13 @@ bool PVMFRTPJitterBufferImpl::CanRetrievePacket(PVMFSharedMediaMsgPtr& aMediaOut
11711172 overflowFlag = false;
11721173 irEstimatedServerClock.GetCurrentTime32(estimatedServClock, overflowFlag, PVMF_MEDIA_CLOCK_MSEC);
11731174 uint32 delta = 0;
1174- if (!iEOSSignalled && (PVTimeComparisonUtils::IsEarlier(estimatedServClock, converted_ts + iEstimatedServerKeepAheadInMilliSeconds, delta) && (delta > 0)))
1175+ if (!iEOSSignalled && (PVTimeComparisonUtils::IsEarlier(clientClock + OOO_DATAPATH_DELAY_FACTOR, converted_ts, delta) && (delta > 0)))
11751176 {
11761177 //hold the available data packet, and wait for hole in the JB due to OOO packet to be filled
11771178 if (!IsCallbackPending(JB_NOTIFY_WAIT_FOR_OOO_PACKET_COMPLETE, NULL))
11781179 {
1179- PVMF_JB_LOGDATATRAFFIC_OUT_E((0, "PVMFJitterBufferNode::SendData Detected Hole in JB PeekTs[%d] clientClock[%d] , ClientClockState [%d], estimatedServClock[%d], EstimatedServClockState[%d], oSessionDurationExpired[%d] MimeStr[%s]", converted_ts, clientClock, irClientPlayBackClock.GetState(), estimatedServClock, irEstimatedServerClock.GetState(), iEOSSignalled, irMimeType.get_cstr()));
1180- PVMF_JB_LOGDATATRAFFIC_OUT((0, "PVMFJitterBufferNode::SendData Detected Hole in JB PeekTs[%d] clientClock[%d] , ClientClockState [%d], estimatedServClock[%d], EstimatedServClockState[%d], oSessionDurationExpired[%d] MimeStr[%s]", converted_ts, clientClock, irClientPlayBackClock.GetState(), estimatedServClock, irEstimatedServerClock.GetState(), iEOSSignalled, irMimeType.get_cstr()));
1180+ PVMF_JB_LOGDATATRAFFIC_OUT_E((0, "PVMFJitterBufferNode::SendData Detected Hole in JB PeekTs[%d] clientClock[%d] , ClientClockState [%d], estimatedServClock[%d], EstimatedServClockState[%d], oSessionDurationExpired[%d] MimeStr[%s], delta[%d]", converted_ts, clientClock, irClientPlayBackClock.GetState(), estimatedServClock, irEstimatedServerClock.GetState(), iEOSSignalled, irMimeType.get_cstr(), delta));
1181+ PVMF_JB_LOGDATATRAFFIC_OUT((0, "PVMFJitterBufferNode::SendData Detected Hole in JB PeekTs[%d] clientClock[%d] , ClientClockState [%d], estimatedServClock[%d], EstimatedServClockState[%d], oSessionDurationExpired[%d] MimeStr[%s], delta[%d]", converted_ts, clientClock, irClientPlayBackClock.GetState(), estimatedServClock, irEstimatedServerClock.GetState(), iEOSSignalled, irMimeType.get_cstr(), delta));
11811182 RequestEventCallBack(JB_NOTIFY_WAIT_FOR_OOO_PACKET_COMPLETE , delta, NULL);
11821183 }
11831184 return false;
Afficher sur ancien navigateur de dépôt.