Revert "msm8974: camera: Update media_profiles for new camrecorder modes"

This reverts commit e6dfb545d60213575c35870c9ad1e807f4489fe6.

Change-Id: Ibd74587646f505cfd590e7b12cfc972800238a7e

1 files changed, 105 insertions, 123 deletions

diff --git a/configs/media/media_profiles_V1_0.xml b/configs/media/media_profiles_V1_0.xml
index 12e37d6..118a15f 100644
--- a/configs/media/media_profiles_V1_0.xml
+++ b/configs/media/media_profiles_V1_0.xml
@@ -25,26 +25,14 @@
 <MediaSettings>
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
     <CamcorderProfiles cameraId="0" startOffsetMs="500" >
-        <!-- Profiles for the back camera -->
-
-        <EncoderProfile quality="qcif" fileFormat="3gp" duration="20">
-            <Video codec="h263"
-                   bitRate="192000"
-                   width="176"
-                   height="144"
-                   frameRate="15" />
-
-            <Audio codec="amrnb"
-                   bitRate="12200"
-                   sampleRate="8000"
-                   channels="1" />
-        </EncoderProfile>
-
-        <EncoderProfile quality="480p" fileFormat="mp4" duration="60">
+        <!--
+        Profiles for the back camera
+        -->
+        <EncoderProfile quality="1080p" fileFormat="mp4" duration="60">
             <Video codec="h264"
-                   bitRate="2000000"
-                   width="640"
-                   height="480"
+                   bitRate="17500000"
+                   width="1920"
+                   height="1080"
                    frameRate="30" />
 
             <Audio codec="aac"
@@ -55,23 +43,10 @@
 
         <EncoderProfile quality="720p" fileFormat="mp4" duration="60">
             <Video codec="h264"
-                   bitRate="14000000"
+                   bitRate="12000000"
                    width="1280"
                    height="720"
-                   frameRate="120" />
-
-            <Audio codec="aac"
-                   bitRate="156000"
-                   sampleRate="48000"
-                   channels="2" />
-        </EncoderProfile>
-
-        <EncoderProfile quality="1080p" fileFormat="mp4" duration="60">
-            <Video codec="h264"
-                   bitRate="20000000"
-                   width="1920"
-                   height="1080"
-                   frameRate="60" />
+                   frameRate="30" />
 
             <Audio codec="aac"
                    bitRate="156000"
@@ -79,11 +54,11 @@
                    channels="2" />
         </EncoderProfile>
 
-        <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
+        <EncoderProfile quality="480p" fileFormat="mp4" duration="60">
             <Video codec="h264"
-                   bitRate="42000000"
-                   width="3840"
-                   height="2160"
+                   bitRate="4000000"
+                   width="720"
+                   height="480"
                    frameRate="30" />
 
             <Audio codec="aac"
@@ -92,25 +67,26 @@
                    channels="2" />
         </EncoderProfile>
 
-        <EncoderProfile quality="timelapseqcif" fileFormat="3gp" duration="20">
+        <EncoderProfile quality="qcif" fileFormat="3gp" duration="20">
             <Video codec="h263"
-                   bitRate="192000"
+                   bitRate="96000"
                    width="176"
                    height="144"
                    frameRate="15" />
-            <!-- audio setting is ignored -->
+
             <Audio codec="amrnb"
                    bitRate="12200"
                    sampleRate="8000"
                    channels="1" />
         </EncoderProfile>
 
-        <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="60">
+        <EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="60">
             <Video codec="h264"
-                   bitRate="2000000"
-                   width="640"
-                   height="480"
+                   bitRate="17500000"
+                   width="1920"
+                   height="1080"
                    frameRate="30" />
+
             <!-- audio setting is ignored -->
             <Audio codec="aac"
                    bitRate="156000"
@@ -120,7 +96,7 @@
 
         <EncoderProfile quality="timelapse720p" fileFormat="mp4" duration="60">
             <Video codec="h264"
-                   bitRate="14000000"
+                   bitRate="12000000"
                    width="1280"
                    height="720"
                    frameRate="30" />
@@ -132,13 +108,12 @@
                    channels="2" />
         </EncoderProfile>
 
-        <EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="60">
+        <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="60">
             <Video codec="h264"
-                   bitRate="20000000"
-                   width="1920"
-                   height="1080"
+                   bitRate="4000000"
+                   width="720"
+                   height="480"
                    frameRate="30" />
-
             <!-- audio setting is ignored -->
             <Audio codec="aac"
                    bitRate="156000"
@@ -146,50 +121,42 @@
                    channels="2" />
         </EncoderProfile>
 
-        <EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
-            <Video codec="h264"
-                   bitRate="42000000"
-                   width="3840"
-                   height="2160"
-                   frameRate="30" />
-
+        <EncoderProfile quality="timelapseqcif" fileFormat="3gp" duration="20">
+            <Video codec="h263"
+                   bitRate="96000"
+                   width="176"
+                   height="144"
+                   frameRate="15" />
             <!-- audio setting is ignored -->
-            <Audio codec="aac"
-                   bitRate="156000"
-                   sampleRate="48000"
-                   channels="2" />
+            <Audio codec="amrnb"
+                   bitRate="12200"
+                   sampleRate="8000"
+                   channels="1" />
         </EncoderProfile>
 
-        <ImageEncoding quality="95" />
+
+        <ImageEncoding quality="90" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />
         <ImageDecoding memCap="20000000" />
 
+        <Camera previewFrameRate="0" />
+
     </CamcorderProfiles>
 
-    <!-- Profiles for the front camera -->
     <CamcorderProfiles cameraId="1" startOffsetMs="380">
-        <EncoderProfile quality="qcif" fileFormat="3gp" duration="20">
-            <Video codec="h263"
-                   bitRate="192000"
-                   width="176"
-                   height="144"
-                   frameRate="15" />
+        <!--
+        Profiles for the front camera
+        -->
 
-            <Audio codec="amrnb"
-                   bitRate="12200"
-                   sampleRate="8000"
-                   channels="1" />
-        </EncoderProfile>
-
-        <EncoderProfile quality="480p" fileFormat="mp4" duration="60">
+        <EncoderProfile quality="1080p" fileFormat="mp4" duration="60">
             <Video codec="h264"
-                   bitRate="2000000"
-                   width="720"
-                   height="480"
+                   bitRate="17500000"
+                   width="1920"
+                   height="1080"
                    frameRate="30" />
 
-           <Audio codec="aac"
+            <Audio codec="aac"
                    bitRate="156000"
                    sampleRate="48000"
                    channels="2" />
@@ -197,7 +164,7 @@
 
         <EncoderProfile quality="720p" fileFormat="mp4" duration="60">
             <Video codec="h264"
-                   bitRate="14000000"
+                   bitRate="12000000"
                    width="1280"
                    height="720"
                    frameRate="30" />
@@ -208,37 +175,37 @@
                    channels="2" />
         </EncoderProfile>
 
-        <EncoderProfile quality="1080p" fileFormat="mp4" duration="60">
+        <EncoderProfile quality="480p" fileFormat="mp4" duration="60">
             <Video codec="h264"
-                   bitRate="20000000"
-                   width="1920"
-                   height="1080"
+                   bitRate="4000000"
+                   width="720"
+                   height="480"
                    frameRate="30" />
 
-            <Audio codec="aac"
+           <Audio codec="aac"
                    bitRate="156000"
                    sampleRate="48000"
                    channels="2" />
         </EncoderProfile>
 
-        <EncoderProfile quality="timelapseqcif" fileFormat="3gp" duration="20">
+        <EncoderProfile quality="qcif" fileFormat="3gp" duration="20">
             <Video codec="h263"
-                   bitRate="192000"
+                   bitRate="96000"
                    width="176"
                    height="144"
                    frameRate="15" />
-            <!-- audio setting is ignored -->
+
             <Audio codec="amrnb"
                    bitRate="12200"
                    sampleRate="8000"
                    channels="1" />
         </EncoderProfile>
 
-        <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="60">
+        <EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="60">
             <Video codec="h264"
-                   bitRate="5000000"
-                   width="720"
-                   height="480"
+                   bitRate="17500000"
+                   width="1920"
+                   height="1080"
                    frameRate="30" />
             <!-- audio setting is ignored -->
             <Audio codec="aac"
@@ -249,7 +216,7 @@
 
         <EncoderProfile quality="timelapse720p" fileFormat="mp4" duration="60">
             <Video codec="h264"
-                   bitRate="8000000"
+                   bitRate="12000000"
                    width="1280"
                    height="720"
                    frameRate="30" />
@@ -260,11 +227,11 @@
                    channels="2" />
         </EncoderProfile>
 
-        <EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="60">
+        <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="60">
             <Video codec="h264"
-                   bitRate="20000000"
-                   width="1920"
-                   height="1080"
+                   bitRate="4000000"
+                   width="720"
+                   height="480"
                    frameRate="30" />
             <!-- audio setting is ignored -->
             <Audio codec="aac"
@@ -273,13 +240,29 @@
                    channels="2" />
         </EncoderProfile>
 
-        <ImageEncoding quality="95" />
+        <EncoderProfile quality="timelapseqcif" fileFormat="3gp" duration="20">
+            <Video codec="h263"
+                   bitRate="96000"
+                   width="176"
+                   height="144"
+                   frameRate="15" />
+            <!-- audio setting is ignored -->
+            <Audio codec="amrnb"
+                   bitRate="12200"
+                   sampleRate="8000"
+                   channels="1" />
+        </EncoderProfile>
+
+        <ImageEncoding quality="90" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />
         <ImageDecoding memCap="20000000" />
 
+        <Camera previewFrameRate="0" />
+
     </CamcorderProfiles>
 
+
     <EncoderOutputFileFormat name="3gp" />
     <EncoderOutputFileFormat name="mp4" />
 
@@ -288,54 +271,53 @@
          In other words, the applications won't be able to use the codec
          or query the capabilities of the codec at all if it is disabled
     -->
-    <VideoEncoderCap name="h264" enabled="true"
-        minBitRate="64000" maxBitRate="42000000"
-        minFrameWidth="176" maxFrameWidth="3840"
-        minFrameHeight="144" maxFrameHeight="2160"
-        minFrameRate="15" maxFrameRate="120"
-        maxHFRFrameWidth="1920" maxHFRFrameHeight="1080"
-        maxHFRMode="120"  />
-
     <VideoEncoderCap name="h263" enabled="true"
         minBitRate="64000" maxBitRate="2000000"
         minFrameWidth="176" maxFrameWidth="800"
         minFrameHeight="144" maxFrameHeight="480"
-        minFrameRate="15" maxFrameRate="30"
+        minFrameRate="7" maxFrameRate="30"
         maxHFRFrameWidth="0" maxHFRFrameHeight="0"
         maxHFRMode="0"  />
 
+    <VideoEncoderCap name="h264" enabled="true"
+        minBitRate="64000" maxBitRate="100000000"
+        minFrameWidth="176" maxFrameWidth="3840"
+        minFrameHeight="144" maxFrameHeight="2160"
+        minFrameRate="3" maxFrameRate="120"
+        maxHFRFrameWidth="1920" maxHFRFrameHeight="1080"
+        maxHFRMode="120"  />
+
     <VideoEncoderCap name="m4v" enabled="true"
         minBitRate="64000" maxBitRate="20000000"
         minFrameWidth="176" maxFrameWidth="1920"
         minFrameHeight="144" maxFrameHeight="1088"
-        minFrameRate="15" maxFrameRate="30"
+        minFrameRate="3" maxFrameRate="30"
         maxHFRFrameWidth="0" maxHFRFrameHeight="0"
         maxHFRMode="0"  />
 
-    <AudioEncoderCap name="aac" enabled="true"
-        minBitRate="8000" maxBitRate="156000"
-        minSampleRate="8000" maxSampleRate="48000"
-        minChannels="1" maxChannels="2" />
+    <AudioEncoderCap name="amrnb" enabled="true"
+        minBitRate="5525" maxBitRate="12200"
+        minSampleRate="8000" maxSampleRate="8000"
+        minChannels="1" maxChannels="1" />
 
     <AudioEncoderCap name="amrwb" enabled="true"
         minBitRate="6600" maxBitRate="23050"
         minSampleRate="16000" maxSampleRate="16000"
         minChannels="1" maxChannels="1" />
 
-    <AudioEncoderCap name="amrnb" enabled="true"
-        minBitRate="5525" maxBitRate="12200"
-        minSampleRate="8000" maxSampleRate="8000"
-        minChannels="1" maxChannels="1" />
+    <AudioEncoderCap name="aac" enabled="true"
+        minBitRate="8000" maxBitRate="156000"
+        minSampleRate="8000" maxSampleRate="48000"
+        minChannels="1" maxChannels="2" />
 
     <VideoDecoderCap name="wmv" enabled="false"/>
     <AudioDecoderCap name="wma" enabled="true"/>
 
-    <VideoEditorCap  maxInputFrameWidth="1920"
+    <VideoEditorCap maxInputFrameWidth="1920"
         maxInputFrameHeight="1088" maxOutputFrameWidth="1920"
-        maxOutputFrameHeight="1088" maxPrefetchYUVFrames="10"/>
+        maxOutputFrameHeight="1088" maxPrefetchYUVFrames="3"/>
 
-    <ExportVideoProfile name="m4v" profile= "1" level="128"/>
-    <ExportVideoProfile name="h263" profile= "1" level="128"/>
-    <ExportVideoProfile name="h264" profile= "1" level="2048"/>
+    <ExportVideoProfile name="h263" profile="1" level="1"/>
+    <ExportVideoProfile name="h264" profile="1" level="1"/>
     <ExportVideoProfile name="m4v" profile="1" level="1"/>
 </MediaSettings>