From 938e398f6a1476e509ab1d56c711bdc62dfb3713 Mon Sep 17 00:00:00 2001
From: OrdenKrieger <OrdenKriegerEDR@googlemail.com>
Date: Wed, 11 Jan 2017 20:30:30 +0100
Subject: z2_plus: Update media config from LA.UM.5.5.r1-00100-8x96.0

---
 configs/media_codecs.xml             |  3 ++-
 configs/media_codecs_performance.xml | 20 ++++++++---------
 configs/media_profiles.xml           | 43 +++++++++++++++++++++++++++++++++++-
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml
index 3657916..0467e84 100644
--- a/configs/media_codecs.xml
+++ b/configs/media_codecs.xml
@@ -408,4 +408,5 @@ Only the three quirks included above are recognized at this point:
         <MediaCodec name="OMX.qti.audio.decoder.flac" type="audio/flac" />
     </Decoders>
     <Include href="media_codecs_google_video.xml" />
-</MediaCodecs>
+    <Include href="media_codecs_ffmpeg.xml" />
+</MediaCodecs>
\ No newline at end of file
diff --git a/configs/media_codecs_performance.xml b/configs/media_codecs_performance.xml
index 22e2476..ec5ca12 100644
--- a/configs/media_codecs_performance.xml
+++ b/configs/media_codecs_performance.xml
@@ -62,10 +62,10 @@ limitations under the License.
             <Limit name="measured-frame-rate-176x144" range="180-180" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="240-250" />
-            <Limit name="measured-frame-rate-640x360" range="50-57" />
-            <Limit name="measured-frame-rate-1280x720" range="17-24" />
-            <Limit name="measured-frame-rate-1920x1080" range="8-12" />
+            <Limit name="measured-frame-rate-320x180" range="39-39" />
+            <Limit name="measured-frame-rate-640x360" range="32-32" />
+            <Limit name="measured-frame-rate-1280x720" range="9-9" />
+            <Limit name="measured-frame-rate-1920x1080" range="3-4" />
         </MediaCodec>
     </Encoders>
     <Decoders>
@@ -110,7 +110,7 @@ limitations under the License.
             <Limit name="measured-frame-rate-1920x1080" range="6-10" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="104-279" />
+            <Limit name="measured-frame-rate-176x144" range="104-104" />
             <Limit name="measured-frame-rate-352x288" range="200-200" />
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
@@ -126,10 +126,10 @@ limitations under the License.
             </Type>
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x240" range="330-381" />
-            <Limit name="measured-frame-rate-640x360" range="139-185" />
-            <Limit name="measured-frame-rate-1280x720" range="22-38" />
-            <Limit name="measured-frame-rate-1920x1080" range="9-18" />
+            <Limit name="measured-frame-rate-320x240" range="132-132" />
+            <Limit name="measured-frame-rate-640x360" range="20-40" />
+            <Limit name="measured-frame-rate-1280x720" range="10-20" />
+            <Limit name="measured-frame-rate-1920x1080" range="7-16" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
             <Limit name="measured-frame-rate-320x240" range="200-230" />
@@ -138,4 +138,4 @@ limitations under the License.
             <Limit name="measured-frame-rate-1920x1080" range="19-23" />
         </MediaCodec>
     </Decoders>
-</MediaCodecs>
+</MediaCodecs>
\ No newline at end of file
diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml
index c2c9fc5..4b2c4b7 100644
--- a/configs/media_profiles.xml
+++ b/configs/media_profiles.xml
@@ -445,6 +445,47 @@
             channels="2" />
     </EncoderProfile>
 
+        <!-- CAMCORDER_QUALITY_HIGH_SPEED_HIGH/720P : 720p@120fps; 27.0 Mbps -->
+        <EncoderProfile quality="highspeedhigh" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="27000000"
+                   width="1280"
+                   height="720"
+                   frameRate="120" />
+            <!-- audio setting is ignored -->
+            <Audio codec="aac"
+                   bitRate="96000"
+                   sampleRate="48000"
+                   channels="2" />
+        </EncoderProfile>
+
+        <EncoderProfile quality="highspeed720p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="27000000"
+                   width="1280"
+                   height="720"
+                   frameRate="120" />
+            <!-- audio setting is ignored -->
+            <Audio codec="aac"
+                   bitRate="96000"
+                   sampleRate="48000"
+                   channels="2" />
+        </EncoderProfile>
+
+        <!-- CAMCORDER_QUALITY_HIGH_SPEED_HIGH/1080P : 1080p@60fps; 34.0 Mbps -->
+        <EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="30">
+            <Video codec="h264"
+                   bitRate="34000000"
+                   width="1920"
+                   height="1080"
+                   frameRate="60" />
+            <!-- audio setting is ignored -->
+            <Audio codec="aac"
+                   bitRate="96000"
+                   sampleRate="48000"
+                   channels="2" />
+        </EncoderProfile>
+
         <ImageEncoding quality="95" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />
@@ -819,4 +860,4 @@
       Codec = mpeg4, Simple profile, level 5
     -->
     <ExportVideoProfile name="m4v" profile= "1" level="128"/>
-</MediaSettings>
+</MediaSettings>
\ No newline at end of file
-- 
cgit v1.2.3