commit 98775af83c81b4ff4dd8efead247bf452d9b75c5
author qctecmdr <qctecmdr@localhost> Fri Jan 03 02:08:27 2020 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jan 03 02:08:27 2020 -0800
tree 687c948c4fd47108a836c1ff95ccc4c547aab39b
parent 73de6eae3994998062698c97a71a6a6f9d68a51b
parent bcb1bd5ffcdaca39393e972604f3a31c706431d8

Merge "Revert "msmnile: add high speed profiles""

conf_files/msmnile/media_profiles.xml

diff --git a/conf_files/msmnile/media_profiles.xml b/conf_files/msmnile/media_profiles.xml
index 795995b..8afb30b 100644
--- a/conf_files/msmnile/media_profiles.xml
+++ b/conf_files/msmnile/media_profiles.xml
@@ -445,47 +445,6 @@
             channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="highspeedhigh" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="36000000"
-             width="1280"
-             height="720"
-             frameRate="120" />
-
-      <!-- audio setting is ignored -->
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="highspeed720p" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="36000000"
-             width="1280"
-             height="720"
-             frameRate="120" />
-
-      <!-- audio setting is ignored -->
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="highspeed480p" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="12000000"
-             width="640"
-             height="480"
-             frameRate="120" />
-
-      <Audio codec="aac"
-             bitRate="156000"
-             sampleRate="48000"
-             channels="2" />
-    </EncoderProfile>
-
         <ImageEncoding quality="95" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />