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 ecc90018c2082a81a8690e084c629be3028ee3b7..beb35ba8945d7237a7a9961ca17cecb132d5e6e9 100644 |
--- a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java |
+++ b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java |
@@ -602,6 +602,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); |
+ } |
+ } |
+ |
@CalledByNative |
private static void setFrameHasADTSHeader(MediaFormat format) { |
format.setInteger(MediaFormat.KEY_IS_ADTS, 1); |