From d100553489601a82d6377d9e31ef13d0aac89f0c Mon Sep 17 00:00:00 2001
From: PacketVideo CM <engbuild@pv.com>
Date: Tue, 13 Oct 2009 22:40:35 -0700
Subject: [PATCH] RIO-6552: SourceContext data must be set for Playback intent

---
 android/PVPlayerExtHandler.h           | 10 +++++-----
 android/playerdriver.cpp               |  6 ++++--
 engines/2way/src/pv_2way_sdkinfo.h     |  2 +-
 engines/author/src/pv_author_sdkinfo.h |  2 +-
 engines/player/src/pv_player_sdkinfo.h |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 android/PVPlayerExtHandler.h

diff --git a/android/PVPlayerExtHandler.h b/android/PVPlayerExtHandler.h
old mode 100755
new mode 100644
index 4a0ba11b..b9715c18
--- a/android/PVPlayerExtHandler.h
+++ b/android/PVPlayerExtHandler.h
@@ -11,8 +11,8 @@ using namespace android;
 class PVPlayerExtensionHandler
 {
 public:
-	PVPlayerExtensionHandler(const PlayerDriver& pd);
-	virtual ~PVPlayerExtensionHandler();
+    PVPlayerExtensionHandler(const PlayerDriver& pd);
+    virtual ~PVPlayerExtensionHandler();
 
     /**
      * Extension UUID String is fetched from the data parcel. If the requested Extension is found in the registry,
@@ -40,14 +40,14 @@ public:
     */
     virtual status_t callPlayerExtension(PlayerExtensionCommand* cmd, const Parcel& data, Parcel& reply);
 
-	// access to playerdriver and its fields
-	PlayerDriver& getPlayerDriver() { return const_cast<PlayerDriver &>(mPlayerDriver); }
+    // access to playerdriver and its fields
+    PlayerDriver& getPlayerDriver() { return const_cast<PlayerDriver &>(mPlayerDriver); }
     PVPlayerInterface* getPlayer() { return mPlayerDriver.mPlayer; }
     void FinishSyncCommand(PlayerCommand* cmd){(const_cast<PlayerDriver &> (mPlayerDriver)).FinishSyncCommand(cmd);}
     // returns true if aCmd was handled by an extension or false to request default completion
     virtual bool commandCompleted( PlayerExtensionCommand* cmd, const PVCmdResponse &resp );
 protected:
-	const PlayerDriver& mPlayerDriver;
+    const PlayerDriver& mPlayerDriver;
     PVPlayerExtensionRegistry mPVPlayerExtnIfaceRegistry;
 private:
     enum{
diff --git a/android/playerdriver.cpp b/android/playerdriver.cpp
index c28df989..a15afc01 100644
--- a/android/playerdriver.cpp
+++ b/android/playerdriver.cpp
@@ -557,17 +557,19 @@ void PlayerDriver::handleSetDataSource(PlayerSetDataSource* command)
             return;
         }
     } else {
+        LOGV("handleSetDataSource - called with a filepath - %s",url);
         mDataSource->SetDataSourceFormatType((const char*)PVMF_MIME_FORMAT_UNKNOWN); // Let PV figure it out
         delete mLocalContextData;
         mLocalContextData = NULL;
-
-        LOGV("handleSetDataSource - called with a filepath - %s",url);
+        mLocalContextData = new PVMFSourceContextData();
+        mLocalContextData->EnableCommonSourceContext();
         const char* ext = strrchr(url, '.');
         if (ext && ( strcasecmp(ext, ".sdp") == 0) ) {
             // For SDP files, currently there is no recognizer. So, to play from such files,
             // there is a need to set the format type.
             mDataSource->SetDataSourceFormatType((const char*)PVMF_MIME_DATA_SOURCE_SDP_FILE);
         }
+        mDataSource->SetDataSourceContextData((OsclAny*)mLocalContextData);
     }
 
     OSCL_TRY(error, mPlayer->AddDataSource(*mDataSource, command));
diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
index 2643dfc8..c78a7e98 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 "1009551"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1009704"
 #define PV2WAY_ENGINE_SDKINFO_DATE 0x20091008
 
 #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 cdb2c96d..44f9c760 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 "1009551"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1009704"
 #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20091008
 
 #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 5b51d171..89d87562 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 "1009551"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1009704"
 #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20091008
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED
-- 
2.11.0