am 5e6b8b3c: am 3d0ef858: Merge "Handle IOException from MediaCodec factory methods"

* commit '5e6b8b3c1d5d3a00dffc19829b0f5f78aa31b97b':
  Handle IOException from MediaCodec factory methods
This commit is contained in:
Andy Hung
2014-01-21 23:13:01 +00:00
committed by Android Git Automerger

View File

@@ -21,6 +21,7 @@ import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.view.Surface; import android.view.Surface;
import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import java.util.Queue; import java.util.Queue;
@@ -136,7 +137,7 @@ public class MediaCodecWrapper {
* @return * @return
*/ */
public static MediaCodecWrapper fromVideoFormat(final MediaFormat trackFormat, public static MediaCodecWrapper fromVideoFormat(final MediaFormat trackFormat,
Surface surface) { Surface surface) throws IOException {
MediaCodecWrapper result = null; MediaCodecWrapper result = null;
MediaCodec videoCodec = null; MediaCodec videoCodec = null;