From b0c5ecc86dfef1f2f278436fee61dc1339a68f5d Mon Sep 17 00:00:00 2001
From: Andy Hung <hunga@google.com>
Date: Thu, 7 Nov 2013 05:05:08 +0000
Subject: [PATCH] Revert "Add "throws IOException" to MediaCodec constructors
 (8)"

This reverts commit 35133e2bc535c164c77bd5e535ff0cf70dfb987a.

Change-Id: Iba6767447262ae092e4d38cccf9a4caf5aa75adb
---
 .../com/widevine/test/MediaDrmAPITest.java    | 47 +++++++------------
 .../src/com/widevine/demo/MediaCodecView.java |  3 +-
 2 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java b/libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java
index c50d072d..117d6b9c 100644
--- a/libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java
+++ b/libwvdrmengine/test/java/src/com/widevine/test/MediaDrmAPITest.java
@@ -32,7 +32,6 @@ import java.util.ListIterator;
 import java.util.Iterator;
 import java.util.HashMap;
 import java.util.Random;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.lang.Exception;
 import java.lang.InterruptedException;
@@ -129,7 +128,8 @@ public class MediaDrmAPITest extends Activity {
                 try {
                     mDrm = new MediaDrm(kWidevineScheme);
                 } catch (MediaDrmException e) {
-                    Log.e(TAG, "Failed to create MediaDrm", e);
+                    Log.e(TAG, "Failed to create MediaDrm: " + e.getMessage());
+                    e.printStackTrace();
                     mTestFailed = true;
                     return;
                 }
@@ -175,7 +175,7 @@ public class MediaDrmAPITest extends Activity {
 
     private void stopDrm(MediaDrm drm) {
         if (drm != mDrm) {
-            Log.e(TAG, "Invalid drm specified in stopDrm");
+            Log.e(TAG, "invalid drm specified in stopDrm");
             mTestFailed = true;
         }
         mLooper.quit();
@@ -287,23 +287,18 @@ public class MediaDrmAPITest extends Activity {
         try {
             crypto = new MediaCrypto(kWidevineScheme, getTestModeSessionId(sessionId));
         } 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;
             finish();
         }
 
         String mime = "video/avc";
-        MediaCodec codec = null;
-        try {
-            if (crypto.requiresSecureDecoderComponent(mime)) {
-                codec = MediaCodec.createByCodecName(getSecureDecoderNameForMime(mime));
-            } else {
-                codec = MediaCodec.createDecoderByType(mime);
-            }
-        } catch (IOException e) {
-            Log.e(TAG, "Failed to create " + mime + " codec", e);
-            mTestFailed = true;
-            finish();
+        MediaCodec codec;
+        if (crypto.requiresSecureDecoderComponent(mime)) {
+            codec = MediaCodec.createByCodecName(getSecureDecoderNameForMime(mime));
+        } else {
+            codec = MediaCodec.createDecoderByType(mime);
         }
 
         MediaFormat format = MediaFormat.createVideoFormat(mime, 1280, 720);
@@ -429,26 +424,20 @@ public class MediaDrmAPITest extends Activity {
         try {
             crypto = new MediaCrypto(kWidevineScheme, getTestModeSessionId(sessionId));
         } 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;
             finish();
         }
 
         String mime = "video/avc";
-        MediaCodec codec = null;
+        MediaCodec codec;
         boolean secure = false;
-
-        try {
-            if (crypto.requiresSecureDecoderComponent(mime)) {
-                codec = MediaCodec.createByCodecName(getSecureDecoderNameForMime(mime));
-                secure = true;
-            } else {
-                codec = MediaCodec.createDecoderByType(mime);
-            }
-        } catch (IOException e) {
-            Log.e(TAG, "Failed to create " + mime + " codec", e);
-            mTestFailed = true;
-            finish();
+        if (crypto.requiresSecureDecoderComponent(mime)) {
+            codec = MediaCodec.createByCodecName(getSecureDecoderNameForMime(mime));
+            secure = true;
+        } else {
+            codec = MediaCodec.createDecoderByType(mime);
         }
 
         MediaFormat format = MediaFormat.createVideoFormat(mime, 1280, 720);
diff --git a/proprietary/samplePlayer/src/com/widevine/demo/MediaCodecView.java b/proprietary/samplePlayer/src/com/widevine/demo/MediaCodecView.java
index 7d7c1ce5..4853d01e 100644
--- a/proprietary/samplePlayer/src/com/widevine/demo/MediaCodecView.java
+++ b/proprietary/samplePlayer/src/com/widevine/demo/MediaCodecView.java
@@ -499,8 +499,7 @@ class MediaCodecView extends SurfaceView
     }
 
     private void addTrack(
-            int trackIndex, MediaFormat format, boolean encrypted) 
-            throws IOException {
+            int trackIndex, MediaFormat format, boolean encrypted) {
         String mime = format.getString(MediaFormat.KEY_MIME);
 
         boolean isVideo = mime.startsWith("video/");