diff options
author | Andy Hung <hunga@google.com> | 2013-11-07 04:06:31 +0000 |
---|---|---|
committer | Andy Hung <hunga@google.com> | 2013-11-07 04:06:31 +0000 |
commit | 8ca55fc980a567270d397c7392fd5fa8490f6d42 (patch) | |
tree | 5c5404e80d6bb6c3ed75ba738835819d9be0eeb6 /tests/Camera2Tests | |
parent | 52d8aa79a31c5042d2b43d06f08fa28489b27d1b (diff) | |
download | frameworks_base-8ca55fc980a567270d397c7392fd5fa8490f6d42.zip frameworks_base-8ca55fc980a567270d397c7392fd5fa8490f6d42.tar.gz frameworks_base-8ca55fc980a567270d397c7392fd5fa8490f6d42.tar.bz2 |
Revert "Add "throws IOException" to MediaCodec constructors (3)"
This reverts commit 52d8aa79a31c5042d2b43d06f08fa28489b27d1b.
Change-Id: Ic706e0fb469931664499d00fa3a221726b258673
Diffstat (limited to 'tests/Camera2Tests')
3 files changed, 5 insertions, 27 deletions
diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/decoder/AudioTrackDecoder.java b/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/decoder/AudioTrackDecoder.java index fbea6cd..0219fd7 100644 --- a/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/decoder/AudioTrackDecoder.java +++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/decoder/AudioTrackDecoder.java @@ -59,15 +59,8 @@ public class AudioTrackDecoder extends TrackDecoder { @Override protected MediaCodec initMediaCodec(MediaFormat format) { - MediaCodec mediaCodec; - try { - mediaCodec = MediaCodec.createDecoderByType( - format.getString(MediaFormat.KEY_MIME)); - } catch (IOException e) { - throw new RuntimeException( - "IOException in MediaCodec.createDecoderByType for " - + format.getString(MediaFormat.KEY_MIME), e); - } + MediaCodec mediaCodec = MediaCodec.createDecoderByType( + format.getString(MediaFormat.KEY_MIME)); mediaCodec.configure(format, null, null, 0); return mediaCodec; } diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/decoder/CpuVideoTrackDecoder.java b/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/decoder/CpuVideoTrackDecoder.java index f57eacf..96f3059 100644 --- a/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/decoder/CpuVideoTrackDecoder.java +++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/decoder/CpuVideoTrackDecoder.java @@ -29,7 +29,6 @@ import androidx.media.filterfw.Frame; import androidx.media.filterfw.FrameImage2D; import androidx.media.filterfw.PixelUtils; -import java.io.IOException; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.HashSet; @@ -215,13 +214,7 @@ public class CpuVideoTrackDecoder extends VideoTrackDecoder { return null; } else { String bestCodec = candidateCodecs.firstEntry().getValue(); - try { - return MediaCodec.createByCodecName(bestCodec); - } catch (IOException e) { - throw new RuntimeException( - "IOException in MediaCodec.createByCodecName for " - + bestCodec, e); - } + return MediaCodec.createByCodecName(bestCodec); } } diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/decoder/GpuVideoTrackDecoder.java b/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/decoder/GpuVideoTrackDecoder.java index 546cdfc..bbba9d8 100644 --- a/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/decoder/GpuVideoTrackDecoder.java +++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/src/androidx/media/filterfw/decoder/GpuVideoTrackDecoder.java @@ -28,7 +28,6 @@ import androidx.media.filterfw.FrameImage2D; import androidx.media.filterfw.ImageShader; import androidx.media.filterfw.TextureSource; -import java.io.IOException; import java.nio.ByteBuffer; /** @@ -87,16 +86,9 @@ public class GpuVideoTrackDecoder extends VideoTrackDecoder { @Override protected MediaCodec initMediaCodec(MediaFormat format) { - MediaCodec mediaCodec; - try { - mediaCodec = MediaCodec.createDecoderByType( - format.getString(MediaFormat.KEY_MIME)); - } catch (IOException e) { - throw new RuntimeException( - "IOException in MediaCodec.createDecoderByType for " - + format.getString(MediaFormat.KEY_MIME), e); - } Surface surface = new Surface(mSurfaceTexture); + MediaCodec mediaCodec = MediaCodec.createDecoderByType( + format.getString(MediaFormat.KEY_MIME)); mediaCodec.configure(format, surface, null, 0); surface.release(); return mediaCodec; |