Merge 13c84f7bcbb4eeeef34342ae70ffad07c02a555b on remote branch

Change-Id: I5c4652d3cee08d353ae0ce54f56f6f476ce95f59

5 files changed, 17 insertions, 13 deletions

diff --git a/conf_files/bengal/media_codecs.xml b/conf_files/bengal/media_codecs.xml
index 411a5240..ef1bfb0a 100644
--- a/conf_files/bengal/media_codecs.xml
+++ b/conf_files/bengal/media_codecs.xml
@@ -111,8 +111,8 @@ Only the three quirks included above are recognized at this point:
  ______________________________________________________
  | Codec    | W       H      fps     Mbps     MB/s    |
  |__________|_________________________________________|
- | h264     | 1920    1088    30      60     244800   |
- | hevc     | 1920    1088    30      60     244800   |
+ | h264     | 1920    1088    60      60     489600   |
+ | hevc     | 1920    1088    60      60     489600   |
  | mpeg4-sw | 864     480     30      8       48600   |
  | h263-sw  | 864     480     30      2       48600   |
  |__________|_________________________________________|
@@ -133,13 +133,12 @@ Only the three quirks included above are recognized at this point:
             <Limit name="size" min="128x128" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="64" max="244800" />
+            <Limit name="blocks-per-second" min="64" max="489600" />
             <Limit name="bitrate" range="1-60000000" />
             <Limit name="frame-rate" range="1-120" />
             <Limit name="concurrent-instances" max="16" />
-            <Limit name="performance-point-1920x1080" value="30" />
-            <Limit name="performance-point-1280x720" value="60" />
-            <Limit name="performance-point-720x480" value="120" />
+            <Limit name="performance-point-1920x1080" value="60" />
+            <Limit name="performance-point-1280x720" value="120" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.hevc" type="video/hevc" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -148,15 +147,14 @@ Only the three quirks included above are recognized at this point:
             <Limit name="size" min="128x128" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="64" max="244800" />
+            <Limit name="blocks-per-second" min="64" max="489600" />
             <Limit name="bitrate" range="1-60000000" />
             <Limit name="frame-rate" range="1-120" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="quality" range="0-100" default="80" />
             <Feature name="bitrate-modes" value="VBR,CBR" />
-            <Limit name="performance-point-1920x1080" value="30" />
-            <Limit name="performance-point-1280x720" value="60" />
-            <Limit name="performance-point-720x480" value="120" />
+            <Limit name="performance-point-1920x1080" value="60" />
+            <Limit name="performance-point-1280x720" value="120" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.hevc.cq" type="video/hevc" >
                 <Quirk name="requires-allocate-on-input-ports" />
diff --git a/conf_files/bengal/media_codecs_performance.xml b/conf_files/bengal/media_codecs_performance.xml
index bb025c0b..f9839e7e 100644
--- a/conf_files/bengal/media_codecs_performance.xml
+++ b/conf_files/bengal/media_codecs_performance.xml
@@ -158,7 +158,7 @@ limitations under the License.
             <Limit name="measured-frame-rate-1920x1080" range="20-29" />
         </MediaCodec>
         <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="376-524" />
+            <Limit name="measured-frame-rate-176x144" range="1374-1403" />
             <Limit name="measured-frame-rate-352x288" range="310-415" />
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
diff --git a/conf_files/bengal/media_codecs_performance_khaje.xml b/conf_files/bengal/media_codecs_performance_khaje.xml
index 98480a27..72ea25f8 100644
--- a/conf_files/bengal/media_codecs_performance_khaje.xml
+++ b/conf_files/bengal/media_codecs_performance_khaje.xml
@@ -158,7 +158,7 @@ limitations under the License.
             <Limit name="measured-frame-rate-1920x1080" range="20-29" />
         </MediaCodec>
         <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="376-524" />
+            <Limit name="measured-frame-rate-176x144" range="1374-1403" />
             <Limit name="measured-frame-rate-352x288" range="310-415" />
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
diff --git a/media-prop/init.qti.media.rc b/media-prop/init.qti.media.rc
index 74ff2770..ce80d3da 100644
--- a/media-prop/init.qti.media.rc
+++ b/media-prop/init.qti.media.rc
@@ -1,7 +1,7 @@
 #==============================================================================
 #       init.qti.media.rc
 #
-# Copyright (c) 2020, The Linux Foundation. All rights reserved.
+# Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -37,6 +37,7 @@ service qti-media /vendor/bin/init.qti.media.sh
     seclabel u:r:vendor_qti_media:s0
 
 on early-init
+    setprop vendor.media.system.build_codename ${ro.build.version.release_or_codename}
     start qti-media
 
 on post-fs-data
diff --git a/media-prop/init.qti.media.sh b/media-prop/init.qti.media.sh
index fa9f77f6..c2a9727f 100644
--- a/media-prop/init.qti.media.sh
+++ b/media-prop/init.qti.media.sh
@@ -30,6 +30,8 @@
 # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #===============================================================================
 
+build_codename=`getprop vendor.media.system.build_codename`
+
 if [ -f /sys/devices/soc0/soc_id ]; then
     soc_hwid=`cat /sys/devices/soc0/soc_id` 2> /dev/null
 else
@@ -49,6 +51,9 @@ case "$target" in
                ;;
            518)
                setprop vendor.media.target.version 3
+               if [ $build_codename -le "12" ]; then
+                   setprop vendor.netflix.bsp_rev "Q6115-31409-1"
+               fi
                ;;
            *)
                sku_ver=`cat /sys/devices/platform/soc/5a00000.qcom,vidc/sku_version` 2> /dev/null