Chromium Code Reviews| Index: media/base/android/java/src/org/chromium/media/MediaCodecBridge.java |
| diff --git a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java |
| index 089581cea862eabc44ac432ae0901d5fb7be156b..b7fbdcf55200bf13dc3759861de5a6c9d9c81a01 100644 |
| --- a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java |
| +++ b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java |
| @@ -620,6 +620,18 @@ class MediaCodecBridge { |
| } |
| } |
| + @TargetApi(Build.VERSION_CODES.M) |
| + @CalledByNative |
| + private void setSurface(Surface surface) { |
| + try { |
| + mMediaCodec.setOutputSurface(surface); |
| + } catch (IllegalArgumentException e) { |
| + Log.e(TAG, "Cannot set output surface", e); |
| + } catch (IllegalStateException e) { |
| + Log.e(TAG, "Cannot set output surface", e); |
|
watk
2016/11/03 20:26:34
minor: you should be able to write "catch(IAE | IS
DaleCurtis
2016/11/03 23:25:05
Done.
|
| + } |
| + } |
| + |
| @CalledByNative |
| private static void setFrameHasADTSHeader(MediaFormat format) { |
| format.setInteger(MediaFormat.KEY_IS_ADTS, 1); |