curie: sync to 8.1 trunk, cddbd6a04 [1/2]

PD#157686

media_codecs: fix vts VtsHalMediaOmxStoreV1_0Host

Change-Id: Ic5f07e57595af7ca7ab546b402944c7ae15e3114

3 files changed, 11 insertions, 42 deletions

diff --git a/files/media_codecs.xml b/files/media_codecs.xml
index b5b391d..c2621eb 100644
--- a/files/media_codecs.xml
+++ b/files/media_codecs.xml
@@ -207,6 +207,16 @@ Only the three quirks included above are recognized at this point:
             <Feature name="tunneled-playback" />
 	    <Limit name="concurrent-instances" max="1" />
         </MediaCodec>
+        <MediaCodec name="OMX.amlogic.vp6.decoder.sw" type="video/x-vnd.on2.vp6" />
+        <MediaCodec name="OMX.amlogic.vp6a.decoder.sw" type="video/x-vnd.on2.vp6a" />
+        <MediaCodec name="OMX.amlogic.vp6f.decoder.sw" type="video/x-vnd.on2.vp6f" />
+        <MediaCodec name="OMX.amlogic.rm10.decoder.sw" type="video/rm10" />
+        <MediaCodec name="OMX.amlogic.rm20.decoder.sw" type="video/rm20" />
+        <MediaCodec name="OMX.amlogic.rm30.decoder.sw" type="video/rm30" />
+        <MediaCodec name="OMX.amlogic.rm40.decoder.sw" type="video/rm40" />
+        <MediaCodec name="OMX.amlogic.wmv2.decoder.sw" type="video/wmv2" />
+        <MediaCodec name="OMX.amlogic.wmv1.decoder.sw" type="video/wmv1" />
+        <MediaCodec name="OMX.google.ffmpeg.decoder.sw" type="audio/ffmpeg" />
         <MediaCodec name="OMX.google.amrnb.decoder" type="audio/3gpp" />
         <MediaCodec name="OMX.google.amrwb.decoder" type="audio/amr-wb" />
         <MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm" />
@@ -223,12 +233,8 @@ Only the three quirks included above are recognized at this point:
         <MediaCodec name="OMX.google.wmapro.decoder" type="audio/wmapro" />
         <MediaCodec name="OMX.google.ape.decoder" type="audio/ape" />
         <MediaCodec name="OMX.google.truehd.decoder" type="audio/truehd" />
-        <MediaCodec name="OMX.google.ffmpeg.decoder" type="audio/ffmpeg" />
         <MediaCodec name="OMX.google.raw.decoder" type="audio/raw" />
-        <MediaCodec name="OMX.google.ac3.decoder" type="audio/ac3" />
-        <MediaCodec name="OMX.google.eac3.decoder" type="audio/eac3" />
         <MediaCodec name="OMX.google.dtshd.decoder" type="audio/dtshd" />
-        <MediaCodec name="OMX.google.mp2.decoder" type="audio/mpeg-L2" />
         <MediaCodec name="OMX.google.opus.decoder" type="audio/opus">
             <Limit name="channel-count" max="8" />
             <Limit name="sample-rate" ranges="48000" />
@@ -265,18 +271,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-5000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-
-        <MediaCodec name="OMX.google.vp6.decoder" type="video/x-vnd.on2.vp6" />
-        <MediaCodec name="OMX.google.vp6a.decoder" type="video/x-vnd.on2.vp6a" />
-        <MediaCodec name="OMX.google.vp6f.decoder" type="video/x-vnd.on2.vp6f" />
-        <MediaCodec name="OMX.google.rm10.decoder" type="video/rm10" />
-        <MediaCodec name="OMX.google.rm20.decoder" type="video/rm20" />
-        <MediaCodec name="OMX.google.rm30.decoder" type="video/rm30" />
-        <MediaCodec name="OMX.google.rm40.decoder" type="video/rm40" />
-        <MediaCodec name="OMX.google.wmv2.decoder" type="video/wmv2" />
-        <MediaCodec name="OMX.google.wmv1.decoder" type="video/wmv1" />
-
-
         <MediaCodec name="OMX.google.mp3.decoder" >
             <Type  name="audio/mpeg" />
             <Quirk name="needs-flush-before-disable" />
diff --git a/files/media_codecs_performance.xml b/files/media_codecs_performance.xml
index 90d3f2e..c71c501 100644
--- a/files/media_codecs_performance.xml
+++ b/files/media_codecs_performance.xml
@@ -76,7 +76,7 @@
             <Limit name="measured-frame-rate-320x180" range="676-676" />
             <Limit name="measured-frame-rate-640x360" range="121-121" />
             <Limit name="measured-frame-rate-1280x720" range="93-93" />
-            <Limit name="measured-frame-rate-1920x1080" range="42-42" />
+            <Limit name="measured-frame-rate-1920x1080" range="9-9" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
             <Limit name="measured-frame-rate-320x180" range="265-265" />
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config_tv.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config_tv.xml
deleted file mode 100644
index 1ce2d5d..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config_tv.xml
+++ b/dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Bounds [left top right bottom] on screen for picture-in-picture (PIP) windows,
-         when the PIP menu is shown with settings. -->
-    <string translatable="false" name="pip_settings_bounds">"250 356 730 626"</string>
-
-    <!-- Bounds [left top right bottom] on screen for picture-in-picture (PIP) windows,
-         when the PIP menu is shown in center. -->
-    <string translatable="false" name="pip_menu_bounds">"396 180 884 454"</string>
-</resources>