widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c3c29486: 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.

Browse Source 
* commit 'c3c294866b007439ef058db8b8079160bf04d713':
  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.
This commit is contained in:
Edwin Wong
2011-06-03 15:55:37 -07:00
committed by Android Git Automerger
parent 40d160cc3f c3c294866b
commit 1ededb8e61
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proprietary/samplePlayer/src/com/widevine/demo/AssetActivity.java
View File

@@ -239,13 +239,13 @@ public abstract class AssetActivity extends Activity {
String imageUrl = null; String imageUrl = null;
if (assetItem.getImagePath() == null || assetItem.getImagePath().equals("")) { 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); clipImage = BitmapFactory.decodeResource(getResources(), R.drawable.download_clip);
else else
clipImage = BitmapFactory.decodeResource(getResources(), R.drawable.streaming_clip); clipImage = BitmapFactory.decodeResource(getResources(), R.drawable.streaming_clip);
} else { } else {
InputStream bitmapStream = null; InputStream bitmapStream = null;
if (assetItem.getAssetPath().indexOf("http") != -1) { if (assetItem.getImagePath().contains("http")) {
imageUrl = assetItem.getImagePath(); imageUrl = assetItem.getImagePath();
if (imageUrl != null) { if (imageUrl != null) {

2
proprietary/samplePlayer/src/com/widevine/demo/HttpParser.java
View File

@@ -94,7 +94,7 @@ public class HttpParser extends Thread {
start = htmlText.indexOf("\"", start) + 1; start = htmlText.indexOf("\"", start) + 1;
end = htmlText.indexOf("\"", start); end = htmlText.indexOf("\"", start);
imagePath = htmlText.substring(start, end); imagePath = htmlText.substring(start, end);
if (!imagePath.contains("http")) { if (!imagePath.contains("http") && !imagePath.contains("wvplay")) {
imagePath = rootUrl + imagePath; imagePath = rootUrl + imagePath;
} }
start = htmlText.indexOf("<p>", start) + "<p>".length(); start = htmlText.indexOf("<p>", start) + "<p>".length();

8
proprietary/samplePlayer/src/com/widevine/demo/StreamingActivity.java
View File

@@ -42,8 +42,8 @@ public class StreamingActivity extends AssetActivity {
for (int i = 0; i < assets.size();) { for (int i = 0; i < assets.size();) {
AssetsPage page = new AssetsPage(); AssetsPage page = new AssetsPage();
for (int j = 0; j < AssetsPage.MAX_ITEMS && i < assets.size(); j++, i++) { for (int j = 0; j < AssetsPage.MAX_ITEMS && i < assets.size(); j++, i++) {
page.addPage(assets.get(i).getAssetPath(), assets.get(i).getImagePath(), assets page.addPage(assets.get(i).getAssetPath(),
.get(i).getTitle()); assets.get(i).getImagePath(), assets.get(i).getTitle());
} }
pages.add(page); pages.add(page);
} }
@@ -56,8 +56,8 @@ public class StreamingActivity extends AssetActivity {
for (int i = 0; i < assets.size();) { for (int i = 0; i < assets.size();) {
AssetsPage page = new AssetsPage(); AssetsPage page = new AssetsPage();
for (int j = 0; j < AssetsPage.MAX_ITEMS && i < assets.size(); j++, i++) { for (int j = 0; j < AssetsPage.MAX_ITEMS && i < assets.size(); j++, i++) {
page.addPage(assets.get(i).getUri(), assets.get(i).getThumbnail(), assets page.addPage(assets.get(i).getUri(), assets.get(i).getThumbnail(),
.get(i).getTitle()); assets.get(i).getTitle());
} }
pages.add(page); pages.add(page);
} }

2
proprietary/samplePlayer/src/com/widevine/demo/VideoPlayerView.java
View File

@@ -62,7 +62,7 @@ public class VideoPlayerView extends Activity {
private View createView() { private View createView() {
enteringFullScreen = false; 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 = new WidevineDrm(this);
drm.logBuffer.append("Asset Uri: " + assetUri + "\n"); drm.logBuffer.append("Asset Uri: " + assetUri + "\n");