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..d04884e9d446a9b911566e5826b460a3a82574fe 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 boolean setSurface(Surface surface) { |
+ try { |
+ mMediaCodec.setOutputSurface(surface); |
+ } catch (IllegalArgumentException | IllegalStateException e) { |
+ Log.e(TAG, "Cannot set output surface", e); |
+ return false; |
+ } |
+ return true; |
+ } |
+ |
@CalledByNative |
private static void setFrameHasADTSHeader(MediaFormat format) { |
format.setInteger(MediaFormat.KEY_IS_ADTS, 1); |