aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacketVideo CM <engbuild@pv.com>2010-06-23 14:06:54 -0700
committerPacketVideo CM <engbuild@pv.com>2010-06-23 14:31:05 -0700
commitce24f6cd07609463347cdfb825d1e1a002860f36 (patch)
tree3b79e3288f202d11f384724cc514c98b39926bd9
parent2230762b384e5facb00d8e1887ef1ddcf0e9eb08 (diff)
downloadopencore-ce24f6cd07609463347cdfb825d1e1a002860f36.tar.gz
RIO-9168: Audio timestamp was not initialized properly for LATM case.
Change-Id: Ide6fa87753b2d3cb7435d3dc98cf419db21579bb
-rw-r--r--engines/2way/src/pv_2way_sdkinfo.h2
-rw-r--r--engines/author/src/pv_author_sdkinfo.h2
-rw-r--r--engines/player/src/pv_player_sdkinfo.h2
-rw-r--r--nodes/pvomxaudiodecnode/src/pvmf_omx_audiodec_node.cpp17
4 files changed, 12 insertions, 11 deletions
diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index b8c4dd62c..3538df57e 100644
--- a/engines/2way/src/pv_2way_sdkinfo.h
+++ b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
// This header file is automatically generated at build-time
// *** OFFICIAL RELEASE INFO -- Will not auto update
-#define PV2WAY_ENGINE_SDKINFO_LABEL "1504894"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1505093"
#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100618
#endif //PV_2WAY_SDKINFO_H_INCLUDED
diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
index 5ecbb4ae8..800981af3 100644
--- a/engines/author/src/pv_author_sdkinfo.h
+++ b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
// This header file is automatically generated at build-time
// *** OFFICIAL RELEASE INFO -- Will not auto update
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1504894"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1505093"
#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100618
#endif //PV_AUTHOR_SDKINFO_H_INCLUDED
diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
index bae522cb2..f027e2658 100644
--- a/engines/player/src/pv_player_sdkinfo.h
+++ b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
// This header file is automatically generated at build-time
// *** OFFICIAL RELEASE INFO -- Will not auto update
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1504894"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1505093"
#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100618
#endif //PV_PLAYER_SDKINFO_H_INCLUDED
diff --git a/nodes/pvomxaudiodecnode/src/pvmf_omx_audiodec_node.cpp b/nodes/pvomxaudiodecnode/src/pvmf_omx_audiodec_node.cpp
index c234e1029..d0c450671 100644
--- a/nodes/pvomxaudiodecnode/src/pvmf_omx_audiodec_node.cpp
+++ b/nodes/pvomxaudiodecnode/src/pvmf_omx_audiodec_node.cpp
@@ -413,6 +413,14 @@ bool PVMFOMXAudioDecNode::ProcessIncomingMsg(PVMFPortInterface* aPort)
// if we end up here, the msg is a data message
+ if (iFirstDataMsgAfterBOS)
+ {
+ PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iDataPathLogger, PVLOGMSG_INFO,
+ (0, "PVMFOMXAudioDecNode::ProcessIncomingMsg: iTSOfFirstDataMsgAfterBOS = %d", msg->getTimestamp()));
+ iTSOfFirstDataMsgAfterBOS = msg->getTimestamp();
+ iInputTimestampClock_LH = iTSOfFirstDataMsgAfterBOS;
+ iInputTimestampClock_UH = 0;
+ }
///////////////////////////////////////////////////////////////////////////////////////
@@ -564,14 +572,7 @@ bool PVMFOMXAudioDecNode::ProcessIncomingMsg(PVMFPortInterface* aPort)
PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iDataPathLogger, PVLOGMSG_INFO,
(0, "PVMFOMXAudioDecNode::ProcessIncomingMsg: TS=%d, SEQNUM= %d", msg->getTimestamp(), msg->getSeqNum()));
- if (iFirstDataMsgAfterBOS)
- {
- PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iDataPathLogger, PVLOGMSG_INFO,
- (0, "PVMFOMXAudioDecNode::ProcessIncomingMsg: iTSOfFirstDataMsgAfterBOS = %d", msg->getTimestamp()));
- iTSOfFirstDataMsgAfterBOS = msg->getTimestamp();
- iInputTimestampClock_LH = iTSOfFirstDataMsgAfterBOS;
- iInputTimestampClock_UH = 0;
- }
+
convertToPVMFMediaData(iDataIn, msg);
((PVMFOMXDecPort*)aPort)->iNumFramesConsumed++;
}