From 28e710798eaaf5d7d17ee9464dacdae258248d5d Mon Sep 17 00:00:00 2001 From: Alex Leung Date: Mon, 5 Feb 2018 13:42:48 -0800 Subject: [PATCH] Only allow MediaTek H264 HW Codec for O_MR1 or later MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8761 Change-Id: I3e5a1d97a5e89cb95bb94c2e892be1f3e63e9383 Reviewed-on: https://webrtc-review.googlesource.com/48200 Reviewed-by: Alex Glaznev Commit-Queue: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#21900} --- sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java | 6 +++--- sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java b/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java index cc014fa988..def4299b5a 100644 --- a/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java +++ b/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java @@ -104,7 +104,7 @@ public class MediaCodecVideoDecoder { supportedPrefixes.add("OMX.Intel."); supportedPrefixes.add("OMX.Exynos."); if (PeerConnectionFactory.fieldTrialsFindFullName("WebRTC-MediaTekH264").equals("Enabled") - && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) { supportedPrefixes.add("OMX.MTK."); } return supportedPrefixes.toArray(new String[supportedPrefixes.size()]); @@ -210,9 +210,9 @@ public class MediaCodecVideoDecoder { != null) { return true; } - // Support H.264 HP decoding on MediaTek chips for Android O and above + // Support H.264 HP decoding on MediaTek chips for Android O_MR1 and above if (PeerConnectionFactory.fieldTrialsFindFullName("WebRTC-MediaTekH264").equals("Enabled") - && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O + && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 && findDecoder(H264_MIME_TYPE, new String[] {supportedMediaTekH264HighProfileHwCodecPrefix}) != null) { return true; diff --git a/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java b/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java index bcb4b98a6b..efc5a59358 100644 --- a/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java +++ b/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java @@ -177,7 +177,7 @@ public class MediaCodecVideoEncoder { private static final MediaCodecProperties exynosH264HwProperties = new MediaCodecProperties( "OMX.Exynos.", Build.VERSION_CODES.LOLLIPOP, BitrateAdjustmentType.FRAMERATE_ADJUSTMENT); private static final MediaCodecProperties mediatekH264HwProperties = new MediaCodecProperties( - "OMX.MTK.", Build.VERSION_CODES.O, BitrateAdjustmentType.FRAMERATE_ADJUSTMENT); + "OMX.MTK.", Build.VERSION_CODES.O_MR1, BitrateAdjustmentType.FRAMERATE_ADJUSTMENT); private static final MediaCodecProperties[] h264HwList() { final ArrayList supported_codecs = new ArrayList(); supported_codecs.add(qcomH264HwProperties);