change defconfig and add Camera2

Change-Id: I1ac11d8d4972f4f46a761677e3bc9940fe754175

3 files changed, 57 insertions, 95 deletions

diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml
index 45298b6..aece615 100644
--- a/configs/media_codecs.xml
+++ b/configs/media_codecs.xml
@@ -91,7 +91,7 @@ Only the three quirks included above are recognized at this point:
  |          | (4096)  (2160)  (56)    (100)           |            |
  | mpeg4    | 1920    1088    60      60      489600  |  N         |
  | vc1      | 1920    1088    60      60      489600  |  Y         |
- | vp8      | 3840    2160    30      100     979200  |  N         |
+ | vp8      | 3840    2160    30      20      979200  |  N         |
  | vp9      | 3840    2160    30      100     979200  |  Y         |
  | divx3    | 720     480     30      2       40500   |  N         |
  | div4/5/6 | 1920    1088    30      10      244800  |  N         |
@@ -107,7 +107,7 @@ Only the three quirks included above are recognized at this point:
  | h264     | 3840    2160    30      100     979200  |
  | hevc     | 3840    2160    30      100     979200  |
  | mpeg4    | 1920    1088    60      60      489600  |
- | vp8      | 3840    2160    30      100     979200  |
+ | vp8      | 3840    2160    30      20      979200  |
  | h263     | 864     480     30      2       48600   |
  |__________|_________________________________________|
 -->
@@ -181,7 +181,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="979200" />
-            <Limit name="bitrate" range="1-100000000" />
+            <Limit name="bitrate" range="1-20000000" />
             <Limit name="frame-rate" range="1-240" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="intra-refresh" />
@@ -349,7 +349,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="979200" />
-            <Limit name="bitrate" range="1-100000000" />
+            <Limit name="bitrate" range="1-20000000" />
             <Limit name="frame-rate" range="1-240" />
             <Feature name="adaptive-playback" />
             <Limit name="concurrent-instances" max="16" />
@@ -373,7 +373,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="979200" />
-            <Limit name="bitrate" range="1-100000000" />
+            <Limit name="bitrate" range="1-20000000" />
             <Limit name="frame-rate" range="1-240" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
@@ -404,7 +404,8 @@ Only the three quirks included above are recognized at this point:
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="6" />
         </MediaCodec>
+        <!-- Audio Software  -->
+        <MediaCodec name="OMX.qti.audio.decoder.flac" type="audio/flac" />
     </Decoders>
     <Include href="media_codecs_google_video.xml" />
-    <Include href="media_codecs_ffmpeg.xml" />
 </MediaCodecs>
diff --git a/configs/media_codecs_performance.xml b/configs/media_codecs_performance.xml
index c5d1e55..44a175e 100644
--- a/configs/media_codecs_performance.xml
+++ b/configs/media_codecs_performance.xml
@@ -45,55 +45,56 @@ limitations under the License.
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="266-266" />
-            <Limit name="measured-frame-rate-640x360" range="332-332" />
-            <Limit name="measured-frame-rate-1280x720" range="154-154" />
-            <Limit name="measured-frame-rate-1920x1080" range="58-58" />
+            <Limit name="measured-frame-rate-640x360" range="165-165" />
+            <Limit name="measured-frame-rate-1280x720" range="49-49" />
+            <Limit name="measured-frame-rate-1920x1080" range="16-40" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="609-609" />
-            <Limit name="measured-frame-rate-720x480" range="287-287" />
-            <Limit name="measured-frame-rate-1280x720" range="151-151" />
-            <Limit name="measured-frame-rate-1920x1080" range="76-76" />
+            <Limit name="measured-frame-rate-320x240" range="90-90" />
+            <Limit name="measured-frame-rate-720x480" range="29-29" />
+            <Limit name="measured-frame-rate-1280x720" range="13-13" />
+            <Limit name="measured-frame-rate-1920x1080" range="6-6" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="798-798" />
+            <Limit name="measured-frame-rate-176x144" range="200-200" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="824-824" />
+            <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="820-820" />
-            <Limit name="measured-frame-rate-640x360" range="317-317" />
-            <Limit name="measured-frame-rate-1280x720" range="122-122" />
-            <Limit name="measured-frame-rate-1920x1080" range="84-84" />
+            <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>
         <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="511-511" />
-            <Limit name="measured-frame-rate-720x480" range="362-362" />
-            <Limit name="measured-frame-rate-1280x720" range="214-214" />
-            <Limit name="measured-frame-rate-1920x1088" range="212-212" />
+            <Limit name="measured-frame-rate-320x240" range="221-221" />
+            <Limit name="measured-frame-rate-720x480" range="156-156" />
+            <Limit name="measured-frame-rate-1280x720" range="111-111" />
+            <Limit name="measured-frame-rate-1920x1088" range="71-71" />
         </MediaCodec>
             <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="585-585" />
-            <Limit name="measured-frame-rate-720x480" range="323-323" />
-            <Limit name="measured-frame-rate-1280x720" range="256-256" />
-            <Limit name="measured-frame-rate-1920x1080" range="219-219" />
-            <Limit name="measured-frame-rate-3840x2160" range="51-51" />
+            <Limit name="measured-frame-rate-352x288" range="222-222" />
+            <Limit name="measured-frame-rate-720x480" range="165-165" />
+            <Limit name="measured-frame-rate-1280x720" range="88-88" />
+            <Limit name="measured-frame-rate-1920x1080" range="56-56" />
+            <Limit name="measured-frame-rate-3840x2160" range="12-12" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
             <Limit name="measured-frame-rate-176x144" range="356-356" />
             <Limit name="measured-frame-rate-352x288" range="292-292" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-480x360" range="426-426" />
+            <Limit name="measured-frame-rate-176x144" range="146-146" />
+            <Limit name="measured-frame-rate-480x360" range="145-145" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x240" range="644-644" />
-            <Limit name="measured-frame-rate-640x360" range="442-442" />
-            <Limit name="measured-frame-rate-1280x720" range="531-531" />
-            <Limit name="measured-frame-rate-1920x1080" range="368-368" />
+            <Limit name="measured-frame-rate-320x240" range="337-337" />
+            <Limit name="measured-frame-rate-640x360" range="337-337" />
+            <Limit name="measured-frame-rate-1280x720" range="337-337" />
+            <Limit name="measured-frame-rate-1920x1080" range="248-248" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" update="true">
             <Limit name="measured-frame-rate-320x240" range="377-377" />
@@ -103,20 +104,21 @@ limitations under the License.
             <Limit name="measured-frame-rate-3840x2160" range="51-51" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="1262-1262" />
-            <Limit name="measured-frame-rate-720x480" range="624-624" />
-            <Limit name="measured-frame-rate-1280x720" range="397-397" />
-            <Limit name="measured-frame-rate-1920x1080" range="150-150" />
+            <Limit name="measured-frame-rate-320x240" range="122-122" />
+            <Limit name="measured-frame-rate-720x480" range="68-68" />
+            <Limit name="measured-frame-rate-1280x720" range="32-32" />
+            <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="1193-1193" />
-            <Limit name="measured-frame-rate-352x288" range="961-961" />
+            <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">
-            <Limit name="measured-frame-rate-352x288" range="1171-1171" />
-            <Limit name="measured-frame-rate-720x480" range="649-649" />
-            <Limit name="measured-frame-rate-1280x720" range="352-352" />
-            <Limit name="measured-frame-rate-1920x1080" range="175-175" />
+            <Limit name="measured-frame-rate-352x288" range="170-170" />
+            <Limit name="measured-frame-rate-640x360" range="89-89" />
+            <Limit name="measured-frame-rate-720x480" range="73-73" />
+            <Limit name="measured-frame-rate-1280x720" range="32-32" />
+            <Limit name="measured-frame-rate-1920x1080" range="21-21" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.decoder" update="true">
             <Type name="video/mp4v-es">
@@ -124,16 +126,16 @@ 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="1399-1399" />
-            <Limit name="measured-frame-rate-640x360" range="824-824" />
-            <Limit name="measured-frame-rate-1280x720" range="155-155" />
-            <Limit name="measured-frame-rate-1920x1080" range="124-124" />
+            <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="775-775" />
-            <Limit name="measured-frame-rate-640x360" range="852-852" />
-            <Limit name="measured-frame-rate-1280x720" range="296-296" />
-            <Limit name="measured-frame-rate-1920x1080" range="172-172" />
+            <Limit name="measured-frame-rate-320x240" range="200-230" />
+            <Limit name="measured-frame-rate-640x360" range="81-90" />
+            <Limit name="measured-frame-rate-1280x720" range="32-40" />
+            <Limit name="measured-frame-rate-1920x1080" range="19-23" />
         </MediaCodec>
     </Decoders>
 </MediaCodecs>
diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml
index 7aed187..f996cd8 100644
--- a/configs/media_profiles.xml
+++ b/configs/media_profiles.xml
@@ -93,7 +93,7 @@
 <MediaSettings>
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
     <!-- Back Camera -->
-    <CamcorderProfiles cameraId="0" startOffsetMs="300">
+    <CamcorderProfiles cameraId="0">
 
     <EncoderProfile quality="low" fileFormat="3gp" duration="30">
       <Video codec="h264"
@@ -445,47 +445,6 @@
             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" />
@@ -493,7 +452,7 @@
 
     </CamcorderProfiles>
     <!-- Front Camera -->
-    <CamcorderProfiles cameraId="1" startOffsetMs="300">
+    <CamcorderProfiles cameraId="1">
 
     <EncoderProfile quality="low" fileFormat="3gp" duration="30">
       <Video codec="h264"
@@ -787,7 +746,7 @@
         maxHFRMode="0"  />
 
     <AudioEncoderCap name="aac" enabled="true"
-        minBitRate="8000" maxBitRate="192000"
+        minBitRate="8000" maxBitRate="96000"
         minSampleRate="8000" maxSampleRate="48000"
         minChannels="1" maxChannels="6" />