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..56c309658d260b7ffa8145d674734c89f901fc60 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,16 @@ class MediaCodecBridge { |
} |
} |
+ @TargetApi(Build.VERSION_CODES.M) |
+ @CalledByNative |
+ private void setSurface(Surface surface) { |
+ try { |
+ mMediaCodec.setOutputSurface(surface); |
+ } catch (IllegalArgumentException | IllegalStateException e) { |
+ Log.e(TAG, "Cannot set output surface", e); |
+ } |
watk
2016/11/08 22:59:03
Seems like this should return an error? If we fail
DaleCurtis
2016/11/08 23:50:10
Done.
|
+ } |
+ |
@CalledByNative |
private static void setFrameHasADTSHeader(MediaFormat format) { |
format.setInteger(MediaFormat.KEY_IS_ADTS, 1); |