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

Merge "Revert "Add "throws IOException" to MediaCodec constructors (8)""

Browse Source
This commit is contained in:
Andy Hung
2013-11-07 05:06:00 +00:00
committed by Android (Google) Code Review
parent e1bbb87b38 b0c5ecc86d
commit 1fda9bd213
2 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java
View File

@@ -32,7 +32,6 @@ import java.util.ListIterator;
import java.util.Iterator; import java.util.Iterator;
import java.util.HashMap; import java.util.HashMap;
import java.util.Random; import java.util.Random;
import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.lang.Exception; import java.lang.Exception;
import java.lang.InterruptedException; import java.lang.InterruptedException;
@@ -129,7 +128,8 @@ public class MediaDrmAPITest extends Activity {
try { try {
mDrm = new MediaDrm(kWidevineScheme); mDrm = new MediaDrm(kWidevineScheme);
} catch (MediaDrmException e) { } catch (MediaDrmException e) {
Log.e(TAG, "Failed to create MediaDrm", e); Log.e(TAG, "Failed to create MediaDrm: " + e.getMessage());
e.printStackTrace();
mTestFailed = true; mTestFailed = true;
return; return;
} }
@@ -175,7 +175,7 @@ public class MediaDrmAPITest extends Activity {
private void stopDrm(MediaDrm drm) { private void stopDrm(MediaDrm drm) {
if (drm != mDrm) { if (drm != mDrm) {
Log.e(TAG, "Invalid drm specified in stopDrm"); Log.e(TAG, "invalid drm specified in stopDrm");
mTestFailed = true; mTestFailed = true;
} }
mLooper.quit(); mLooper.quit();
@@ -287,23 +287,18 @@ public class MediaDrmAPITest extends Activity {
try { try {
crypto = new MediaCrypto(kWidevineScheme, getTestModeSessionId(sessionId)); crypto = new MediaCrypto(kWidevineScheme, getTestModeSessionId(sessionId));
} catch (MediaCryptoException e) { } catch (MediaCryptoException e) {
Log.e(TAG, "Failed to create MediaCrypto", e); Log.e(TAG, "test failed due to exception: " + e.getMessage());
e.printStackTrace();
mTestFailed = true; mTestFailed = true;
finish(); finish();
} }
String mime = "video/avc"; String mime = "video/avc";
MediaCodec codec = null; MediaCodec codec;
try { if (crypto.requiresSecureDecoderComponent(mime)) {
if (crypto.requiresSecureDecoderComponent(mime)) { codec = MediaCodec.createByCodecName(getSecureDecoderNameForMime(mime));
codec = MediaCodec.createByCodecName(getSecureDecoderNameForMime(mime)); } else {
} else { codec = MediaCodec.createDecoderByType(mime);
codec = MediaCodec.createDecoderByType(mime);
}
} catch (IOException e) {
Log.e(TAG, "Failed to create " + mime + " codec", e);
mTestFailed = true;
finish();
} }
MediaFormat format = MediaFormat.createVideoFormat(mime, 1280, 720); MediaFormat format = MediaFormat.createVideoFormat(mime, 1280, 720);
@@ -429,26 +424,20 @@ public class MediaDrmAPITest extends Activity {
try { try {
crypto = new MediaCrypto(kWidevineScheme, getTestModeSessionId(sessionId)); crypto = new MediaCrypto(kWidevineScheme, getTestModeSessionId(sessionId));
} catch (MediaCryptoException e) { } catch (MediaCryptoException e) {
Log.e(TAG, "Failed to create MediaCrypto", e); Log.e(TAG, "test failed due to exception: " + e.getMessage());
e.printStackTrace();
mTestFailed = true; mTestFailed = true;
finish(); finish();
} }
String mime = "video/avc"; String mime = "video/avc";
MediaCodec codec = null; MediaCodec codec;
boolean secure = false; boolean secure = false;
if (crypto.requiresSecureDecoderComponent(mime)) {
try { codec = MediaCodec.createByCodecName(getSecureDecoderNameForMime(mime));
if (crypto.requiresSecureDecoderComponent(mime)) { secure = true;
codec = MediaCodec.createByCodecName(getSecureDecoderNameForMime(mime)); } else {
secure = true; codec = MediaCodec.createDecoderByType(mime);
} else {
codec = MediaCodec.createDecoderByType(mime);
}
} catch (IOException e) {
Log.e(TAG, "Failed to create " + mime + " codec", e);
mTestFailed = true;
finish();
} }
MediaFormat format = MediaFormat.createVideoFormat(mime, 1280, 720); MediaFormat format = MediaFormat.createVideoFormat(mime, 1280, 720);

3
proprietary/samplePlayer/src/com/widevine/demo/MediaCodecView.java
View File

@@ -499,8 +499,7 @@ class MediaCodecView extends SurfaceView
} }
private void addTrack( private void addTrack(
int trackIndex, MediaFormat format, boolean encrypted) int trackIndex, MediaFormat format, boolean encrypted) {
throws IOException {
String mime = format.getString(MediaFormat.KEY_MIME); String mime = format.getString(MediaFormat.KEY_MIME);
boolean isVideo = mime.startsWith("video/"); boolean isVideo = mime.startsWith("video/");