From c3c294866b007439ef058db8b8079160bf04d713 Mon Sep 17 00:00:00 2001
From: Edwin Wong <edwinwong@google.com>
Date: Wed, 1 Jun 2011 16:18:20 -0700
Subject: [PATCH] Uploaded for Robin Connell. Fixed 4466580 Need widevine
 sample demo player support for adaptive streaming. Thumbnails now show and
 content plays for adaptive and oem content pages.

Change-Id: Id03c7cc01be78d7c5d3d7ca66d2a2773273af6fe
---
 .../samplePlayer/src/com/widevine/demo/AssetActivity.java | 4 ++--
 .../samplePlayer/src/com/widevine/demo/HttpParser.java    | 2 +-
 .../src/com/widevine/demo/StreamingActivity.java          | 8 ++++----
 .../src/com/widevine/demo/VideoPlayerView.java            | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/proprietary/samplePlayer/src/com/widevine/demo/AssetActivity.java b/proprietary/samplePlayer/src/com/widevine/demo/AssetActivity.java
index 19501553..ff9c224f 100644
--- a/proprietary/samplePlayer/src/com/widevine/demo/AssetActivity.java
+++ b/proprietary/samplePlayer/src/com/widevine/demo/AssetActivity.java
@@ -239,13 +239,13 @@ public abstract class AssetActivity extends Activity {
         String imageUrl = null;
 
         if (assetItem.getImagePath() == null || assetItem.getImagePath().equals("")) {
-            if (assetItem.getAssetPath().indexOf("http") == -1)
+            if (!assetItem.getAssetPath().contains("http") && !assetItem.getAssetPath().contains("wvplay"))
                 clipImage = BitmapFactory.decodeResource(getResources(), R.drawable.download_clip);
             else
                 clipImage = BitmapFactory.decodeResource(getResources(), R.drawable.streaming_clip);
         } else {
             InputStream bitmapStream = null;
-            if (assetItem.getAssetPath().indexOf("http") != -1) {
+            if (assetItem.getImagePath().contains("http")) {
 
                 imageUrl = assetItem.getImagePath();
                 if (imageUrl != null) {
diff --git a/proprietary/samplePlayer/src/com/widevine/demo/HttpParser.java b/proprietary/samplePlayer/src/com/widevine/demo/HttpParser.java
index 51c02339..74c88de7 100644
--- a/proprietary/samplePlayer/src/com/widevine/demo/HttpParser.java
+++ b/proprietary/samplePlayer/src/com/widevine/demo/HttpParser.java
@@ -94,7 +94,7 @@ public class HttpParser extends Thread {
                 start = htmlText.indexOf("\"", start) + 1;
                 end = htmlText.indexOf("\"", start);
                 imagePath = htmlText.substring(start, end);
-                if (!imagePath.contains("http")) {
+                if (!imagePath.contains("http") && !imagePath.contains("wvplay")) {
                     imagePath = rootUrl + imagePath;
                 }
                 start = htmlText.indexOf("<p>", start) + "<p>".length();
diff --git a/proprietary/samplePlayer/src/com/widevine/demo/StreamingActivity.java b/proprietary/samplePlayer/src/com/widevine/demo/StreamingActivity.java
index 72289de9..5ba75235 100644
--- a/proprietary/samplePlayer/src/com/widevine/demo/StreamingActivity.java
+++ b/proprietary/samplePlayer/src/com/widevine/demo/StreamingActivity.java
@@ -42,8 +42,8 @@ public class StreamingActivity extends AssetActivity {
             for (int i = 0; i < assets.size();) {
                 AssetsPage page = new AssetsPage();
                 for (int j = 0; j < AssetsPage.MAX_ITEMS && i < assets.size(); j++, i++) {
-                    page.addPage(assets.get(i).getAssetPath(), assets.get(i).getImagePath(), assets
-                            .get(i).getTitle());
+                    page.addPage(assets.get(i).getAssetPath(),
+                    assets.get(i).getImagePath(), assets.get(i).getTitle());
                 }
                 pages.add(page);
             }
@@ -56,8 +56,8 @@ public class StreamingActivity extends AssetActivity {
             for (int i = 0; i < assets.size();) {
                 AssetsPage page = new AssetsPage();
                 for (int j = 0; j < AssetsPage.MAX_ITEMS && i < assets.size(); j++, i++) {
-                    page.addPage(assets.get(i).getUri(), assets.get(i).getThumbnail(), assets
-                            .get(i).getTitle());
+                    page.addPage(assets.get(i).getUri(), assets.get(i).getThumbnail(),
+                    assets.get(i).getTitle());
                 }
                 pages.add(page);
             }
diff --git a/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java b/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java
index 4f891e44..6a4970e7 100644
--- a/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java
+++ b/proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java
@@ -62,7 +62,7 @@ public class VideoPlayerView extends Activity {
 
     private View createView() {
         enteringFullScreen = false;
-        assetUri = this.getIntent().getStringExtra("com.widevine.demo.Path");
+        assetUri = this.getIntent().getStringExtra("com.widevine.demo.Path").replaceAll("wvplay", "http");
 
         drm = new WidevineDrm(this);
         drm.logBuffer.append("Asset Uri: " + assetUri + "\n");