commit 28e710798eaaf5d7d17ee9464dacdae258248d5d
author Alex Leung <alexleung@google.com> Mon Feb 05 13:42:48 2018 -0800
committer Commit Bot <commit-bot@chromium.org> Tue Feb 06 09:21:50 2018 +0000
tree 1359b7a5996639089ae0d9d407d39af84530faae
parent 57daeb7ac7f3d80992905b53fea500953fcfd793

Only allow MediaTek H264 HW Codec for O_MR1 or later

Bug: webrtc:8761
Change-Id: I3e5a1d97a5e89cb95bb94c2e892be1f3e63e9383
Reviewed-on: https://webrtc-review.googlesource.com/48200
Reviewed-by: Alex Glaznev <glaznev@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21900}

sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java

diff --git a/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java b/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java
index cc014fa..def4299 100644
--- a/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java
+++ b/sdk/android/api/org/webrtc/MediaCodecVideoDecoder.java
@@ -104,7 +104,7 @@
     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 @@
             != 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;

sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java

diff --git a/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java b/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java
index bcb4b98..efc5a59 100644
--- a/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java
+++ b/sdk/android/api/org/webrtc/MediaCodecVideoEncoder.java
@@ -177,7 +177,7 @@
   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<MediaCodecProperties> supported_codecs = new ArrayList<MediaCodecProperties>();
     supported_codecs.add(qcomH264HwProperties);