From efee6e63ceaee39ef5a90207084cf1af0c6bfedf Mon Sep 17 00:00:00 2001
From: PacketVideo CM <engbuild@pv.com>
Date: Thu, 10 Dec 2009 12:40:24 -0800
Subject: [PATCH] RIO-7867: Updated PVPlayerEngine::ReleaseMetadataValues to
 properly handle clip index argument

---
 engines/2way/src/pv_2way_sdkinfo.h      |  2 +-
 engines/author/src/pv_author_sdkinfo.h  |  2 +-
 engines/player/src/pv_player_engine.cpp | 12 +++++++++---
 engines/player/src/pv_player_sdkinfo.h  |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index 67720be8..b411dc56 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 "1119117"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1119896"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20091202
 
 #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 5d9d4631..cf6b7206 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 "1119117"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1119896"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20091202
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED
diff --git a/engines/player/src/pv_player_engine.cpp b/engines/player/src/pv_player_engine.cpp
index cb2ab8ea..457c7540 100644
--- a/engines/player/src/pv_player_engine.cpp
+++ b/engines/player/src/pv_player_engine.cpp
@@ -442,6 +442,8 @@ PVCommandId PVPlayerEngine::ReleaseMetadataValues(Oscl_Vector<PvmiKvp, OsclMemAl
 
     param.pOsclAny_value = (OsclAny*) & aValueList;
     paramvec.push_back(param);
+    param.uint32_value = aClipIndex;
+    paramvec.push_back(param);
 
     return AddCommandToQueue(PVP_ENGINE_COMMAND_RELEASE_METADATA_VALUE, (OsclAny*)aContextData, &paramvec);
 }
@@ -5302,8 +5304,9 @@ PVMFStatus PVPlayerEngine::DoReleaseMetadataValues(PVPlayerEngineCommand& aCmd)
     }
 
     iGetMetadataValuesParam.iValueList = (Oscl_Vector<PvmiKvp, OsclMemAllocator>*)(aCmd.GetParam(0).pOsclAny_value);
+    iGetMetadataValuesParam.iClipIndex = aCmd.GetParam(1).uint32_value;
 
-    if (iGetMetadataValuesParam.iValueList == NULL)
+    if (iGetMetadataValuesParam.iValueList == NULL || iGetMetadataValuesParam.iClipIndex < 0)
     {
         PVLOGGER_LOGMSG(PVLOGMSG_INST_HLDBG, iLogger, PVLOGMSG_ERR, (0, "PVPlayerEngine::DoReleaseMetadataValues() Passed in parameter invalid."));
         return PVMFErrArgument;
@@ -5314,8 +5317,11 @@ PVMFStatus PVPlayerEngine::DoReleaseMetadataValues(PVPlayerEngineCommand& aCmd)
     {
         PVMFMetadataExtensionInterface* mdif = iMetadataIFList[iMetadataValueReleaseList[0].iMetadataIFListIndex].iInterface;
         OSCL_ASSERT(mdif != NULL);
-        mdif->ReleaseNodeMetadataValues(*(iGetMetadataValuesParam.iValueList), iMetadataValueReleaseList[0].iStartIndex, iMetadataValueReleaseList[0].iEndIndex);
-        iMetadataValueReleaseList.erase(iMetadataValueReleaseList.begin());
+        if (PVMFSuccess == mdif->SetMetadataClipIndex(iGetMetadataKeysParam.iClipIndex))
+        {
+            mdif->ReleaseNodeMetadataValues(*(iGetMetadataValuesParam.iValueList), iMetadataValueReleaseList[0].iStartIndex, iMetadataValueReleaseList[0].iEndIndex);
+            iMetadataValueReleaseList.erase(iMetadataValueReleaseList.begin());
+        }
     }
 
     iReleaseMetadataValuesPending = false;
diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
index 164f458f..e65ca2b4 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 "1119117"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1119896"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20091202
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED
-- 
2.11.0