commit 404d6b3a33c55cb71d8cda86336d133ad59d893c
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 12 21:42:10 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 12 21:42:10 2021 +0000
tree 3aae95a5e70361307eed228f605e46d77c757c85
parent 105bb1e43201e6fc2b3fd98cab0ef4cc14c7fd29
parent 22181bf061e6e29bcf93025459326d4cc91b81a5

Merge "Fix the high speed mode profile" into sc-dev

media_profiles_oriole.xml

diff --git a/media_profiles_oriole.xml b/media_profiles_oriole.xml
index aff6517..a396302 100644
--- a/media_profiles_oriole.xml
+++ b/media_profiles_oriole.xml
@@ -408,20 +408,6 @@
                    channels="1" />
         </EncoderProfile>
 
-        <EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="42000000"
-                   width="1920"
-                   height="1080"
-                   frameRate="240" />
-
-            <!-- audio setting is ignored -->
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
         <ImageEncoding quality="90" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />
@@ -539,20 +525,6 @@
                    channels="1" />
         </EncoderProfile>
 
-        <EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="42000000"
-                   width="1920"
-                   height="1080"
-                   frameRate="120" />
-
-            <!-- audio setting is ignored -->
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
         <ImageEncoding quality="90" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />

media_profiles_raven.xml

diff --git a/media_profiles_raven.xml b/media_profiles_raven.xml
index 909db37..dd0b2e9 100644
--- a/media_profiles_raven.xml
+++ b/media_profiles_raven.xml
@@ -408,20 +408,6 @@
                    channels="1" />
         </EncoderProfile>
 
-        <EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="42000000"
-                   width="1920"
-                   height="1080"
-                   frameRate="240" />
-
-            <!-- audio setting is ignored -->
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
         <ImageEncoding quality="90" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />
@@ -539,20 +525,6 @@
                    channels="1" />
         </EncoderProfile>
 
-        <EncoderProfile quality="highspeed1080p" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="42000000"
-                   width="1920"
-                   height="1080"
-                   frameRate="120" />
-
-            <!-- audio setting is ignored -->
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
         <ImageEncoding quality="90" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />