aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacketVideo CM <engbuild@pv.com>2010-06-15 16:36:05 -0700
committerPacketVideo CM <engbuild@pv.com>2010-06-15 16:36:05 -0700
commite7ca47b8a6c5fdcdb604f4f18a1a73fed824e4e7 (patch)
tree84c856d06075da1586a93d67bac401b2eb99b54b
parent5246e853bcd21fad4c71209a11304e2e30a91f42 (diff)
downloadopencore-e7ca47b8a6c5fdcdb604f4f18a1a73fed824e4e7.tar.gz
RIO-8722: Large File Support in MP4 PDL and PPB (minor additional change 5)
Change-Id: I5cd23dddd68ef78af4c7d1222d680f284135a39d
-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/pvdownloadmanagernode/src/pvmf_memorybufferdatastream_factory.cpp2
-rw-r--r--nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index 9fe81f9ee..ffaa4a6cf 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 "1487764"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1487966"
#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100609
#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 6a6240109..4dfd51294 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 "1487764"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1487966"
#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100609
#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 3749713f8..ac7a94157 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 "1487764"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1487966"
#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100609
#endif //PV_PLAYER_SDKINFO_H_INCLUDED
diff --git a/nodes/pvdownloadmanagernode/src/pvmf_memorybufferdatastream_factory.cpp b/nodes/pvdownloadmanagernode/src/pvmf_memorybufferdatastream_factory.cpp
index 1994046e1..afb6fe701 100644
--- a/nodes/pvdownloadmanagernode/src/pvmf_memorybufferdatastream_factory.cpp
+++ b/nodes/pvdownloadmanagernode/src/pvmf_memorybufferdatastream_factory.cpp
@@ -3810,7 +3810,7 @@ PVMFMemoryBufferDataStreamPermCache::RemoveFirstEntry(uint8*& aFragPtr)
#if (PVLOGGER_INST_LEVEL > PVLOGMSG_INST_LLDBG)
TOsclFileOffset offset = entry->firstFileOffset;
#endif
- TOsclFileOffset size = entry->fillSize;
+ uint32 size = entry->fillSize;
aFragPtr = entry->bufPtr;
diff --git a/nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node.cpp b/nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node.cpp
index e528f26ed..3893c403c 100644
--- a/nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node.cpp
+++ b/nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node.cpp
@@ -7890,7 +7890,7 @@ PVMFStatus PVMFMP4FFParserNode::CheckForMP4HeaderAvailability()
}
else if (iExternalDownload == true)
{
- TOsclFileOffset maxSize = MAX_TOSCLFILEOFFSET_VALUE;
+ TOsclFileOffset maxSize = (TOsclFileOffset)MAX_TOSCLFILEOFFSET_VALUE;
iRequestReadCapacityNotificationID =
iDataStreamInterface->RequestReadCapacityNotification(iDataStreamSessionID,
*this,