prebuilt: move media_codecs and media_profiles to omap4-commonlp5.0

Change-Id: I5c91aa30e2af48f9d925fac07c9c429d6a7197ca

3 files changed, 0 insertions, 491 deletions

diff --git a/common.mk b/common.mk
index 8498db9..61485b4 100644
--- a/common.mk
+++ b/common.mk
@@ -46,8 +46,6 @@ PRODUCT_COPY_FILES += \
 # Prebuilts /system/etc
 PRODUCT_COPY_FILES += \
     $(OTTER_COMMON_FOLDER)/prebuilt/etc/audio_policy.conf:/system/etc/audio_policy.conf \
-    $(OTTER_COMMON_FOLDER)/prebuilt/etc/media_codecs.xml:/system/etc/media_codecs.xml \
-    $(OTTER_COMMON_FOLDER)/prebuilt/etc/media_profiles.xml:/system/etc/media_profiles.xml \
     frameworks/av/media/libstagefright/data/media_codecs_ffmpeg.xml:system/etc/media_codecs_ffmpeg.xml \
     $(OTTER_COMMON_FOLDER)/prebuilt/etc/mixer_paths.xml:/system/etc/mixer_paths.xml \
     $(OTTER_COMMON_FOLDER)/prebuilt/etc/wifi/TQS_S_2.6.ini:/system/etc/wifi/TQS_S_2.6.ini \
diff --git a/prebuilt/etc/media_codecs.xml b/prebuilt/etc/media_codecs.xml
deleted file mode 100644
index a7e3c75..0000000
--- a/prebuilt/etc/media_codecs.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!--
-<!DOCTYPE MediaCodecs [
-<!ELEMENT Include EMPTY>
-<!ATTLIST Include href CDATA #REQUIRED>
-<!ELEMENT MediaCodecs (Decoders|Encoders|Include)*>
-<!ELEMENT Decoders (MediaCodec|Include)*>
-<!ELEMENT Encoders (MediaCodec|Include)*>
-<!ELEMENT MediaCodec (Type|Quirk|Include)*>
-<!ATTLIST MediaCodec name CDATA #REQUIRED>
-<!ATTLIST MediaCodec type CDATA>
-<!ELEMENT Type EMPTY>
-<!ATTLIST Type name CDATA #REQUIRED>
-<!ELEMENT Quirk EMPTY>
-<!ATTLIST Quirk name CDATA #REQUIRED>
-]>
-
-There's a simple and a complex syntax to declare the availability of a
-media codec:
-
-A codec that properly follows the OpenMax spec and therefore doesn't have any
-quirks and that only supports a single content type can be declared like so:
-
-    <MediaCodec name="OMX.foo.bar" type="something/interesting" />
-
-If a codec has quirks OR supports multiple content types, the following syntax
-can be used:
-
-    <MediaCodec name="OMX.foo.bar" >
-        <Type name="something/interesting" />
-        <Type name="something/else" />
-        ...
-        <Quirk name="requires-allocate-on-input-ports" />
-        <Quirk name="requires-allocate-on-output-ports" />
-        <Quirk name="output-buffers-are-unreadable" />
-    </MediaCodec>
-
-Only the three quirks included above are recognized at this point:
-
-"requires-allocate-on-input-ports"
-    must be advertised if the component does not properly support specification
-    of input buffers using the OMX_UseBuffer(...) API but instead requires
-    OMX_AllocateBuffer to be used.
-
-"requires-allocate-on-output-ports"
-    must be advertised if the component does not properly support specification
-    of output buffers using the OMX_UseBuffer(...) API but instead requires
-    OMX_AllocateBuffer to be used.
-
-"output-buffers-are-unreadable"
-    must be advertised if the emitted output buffers of a decoder component
-    are not readable, i.e. use a custom format even though abusing one of
-    the official OMX colorspace constants.
-    Clients of such decoders will not be able to access the decoded data,
-    naturally making the component much less useful. The only use for
-    a component with this quirk is to render the output to the screen.
-    Audio decoders MUST NOT advertise this quirk.
-    Video decoders that advertise this quirk must be accompanied by a
-    corresponding color space converter for thumbnail extraction,
-    matching surfaceflinger support that can render the custom format to
-    a texture and possibly other code, so just DON'T USE THIS QUIRK.
-
--->
-
-<MediaCodecs>
-    <Include href="media_codecs_google_audio.xml" />
-    <Decoders>
-        <MediaCodec name="OMX.TI.DUCATI1.VIDEO.DECODER" >
-            <Type name="video/mp4v-es" />
-            <Type name="video/3gpp" />
-            <Type name="video/avc" />
-            <Type name="video/x-ms-wmv" />
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-        </MediaCodec>
-    </Decoders>
-
-    <Encoders>
-        <MediaCodec name="OMX.TI.DUCATI1.VIDEO.MPEG4E" >
-            <Type name="video/mp4v-es" />
-            <Type name="video/3gpp" />
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-        </MediaCodec>
-
-        <MediaCodec name="OMX.TI.DUCATI1.VIDEO.H264E" type="video/avc" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-        </MediaCodec>
-    </Encoders>
-    <Include href="media_codecs_google_video.xml" />
-    <Include href="media_codecs_ffmpeg.xml" />
-</MediaCodecs>
diff --git a/prebuilt/etc/media_profiles.xml b/prebuilt/etc/media_profiles.xml
deleted file mode 100644
index 5adc912..0000000
--- a/prebuilt/etc/media_profiles.xml
+++ /dev/null
@@ -1,381 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<!DOCTYPE MediaSettings [
-<!ELEMENT MediaSettings (CamcorderProfiles,
-                         EncoderOutputFileFormat+,
-                         VideoEncoderCap+,
-                         AudioEncoderCap+,
-                         VideoDecoderCap,
-                         AudioDecoderCap,
-                         VideoEditorCap,
-                         ExportVideoProfile+)>
-  <!ELEMENT CamcorderProfiles (EncoderProfile+, ImageEncoding+, ImageDecoding, Camera)>
-  <!ELEMENT EncoderProfile (Video, Audio)>
-  <!ATTLIST EncoderProfile quality (timelapse1080p|timelapse720p|timelapse480p|timelapsehigh|timelapselow|480p|qcif|high|low|1080p) #REQUIRED>
-  <!ATTLIST EncoderProfile fileFormat (mp4|3gp) #REQUIRED>
-  <!ATTLIST EncoderProfile duration (30|60) #REQUIRED>
-  <!ELEMENT Video EMPTY>
-  <!ATTLIST Video codec (h264|h263|m4v) #REQUIRED>
-  <!ATTLIST Video bitRate CDATA #REQUIRED>
-  <!ATTLIST Video width CDATA #REQUIRED>
-  <!ATTLIST Video height CDATA #REQUIRED>
-  <!ATTLIST Video frameRate CDATA #REQUIRED>
-  <!ELEMENT Audio EMPTY>
-  <!ATTLIST Audio codec (amrnb|amrwb|aac) #REQUIRED>
-  <!ATTLIST Audio bitRate CDATA #REQUIRED>
-  <!ATTLIST Audio sampleRate CDATA #REQUIRED>
-  <!ATTLIST Audio channels (1|2) #REQUIRED>
-  <!ELEMENT ImageEncoding EMPTY>
-  <!ATTLIST ImageEncoding quality (90|80|70|60|50|40) #REQUIRED>
-  <!ELEMENT ImageDecoding EMPTY>
-  <!ATTLIST ImageDecoding memCap CDATA #REQUIRED>
-  <!ELEMENT Camera EMPTY>
-  <!ATTLIST Camera previewFrameRate CDATA #REQUIRED>
-  <!ELEMENT EncoderOutputFileFormat EMPTY>
-  <!ATTLIST EncoderOutputFileFormat name (mp4|3gp) #REQUIRED>
-  <!ELEMENT VideoEncoderCap EMPTY>
-  <!ATTLIST VideoEncoderCap name (h264|h263|m4v|wmv) #REQUIRED>
-  <!ATTLIST VideoEncoderCap enabled (true|false) #REQUIRED>
-  <!ATTLIST VideoEncoderCap minBitRate CDATA #REQUIRED>
-  <!ATTLIST VideoEncoderCap maxBitRate CDATA #REQUIRED>
-  <!ATTLIST VideoEncoderCap minFrameWidth CDATA #REQUIRED>
-  <!ATTLIST VideoEncoderCap maxFrameWidth CDATA #REQUIRED>
-  <!ATTLIST VideoEncoderCap minFrameHeight CDATA #REQUIRED>
-  <!ATTLIST VideoEncoderCap maxFrameHeight CDATA #REQUIRED>
-  <!ATTLIST VideoEncoderCap minFrameRate CDATA #REQUIRED>
-  <!ATTLIST VideoEncoderCap maxFrameRate CDATA #REQUIRED>
-  <!ELEMENT AudioEncoderCap EMPTY>
-  <!ATTLIST AudioEncoderCap name (amrnb|amrwb|aac|wma) #REQUIRED>
-  <!ATTLIST AudioEncoderCap enabled (true|false) #REQUIRED>
-  <!ATTLIST AudioEncoderCap minBitRate CDATA #REQUIRED>
-  <!ATTLIST AudioEncoderCap maxBitRate CDATA #REQUIRED>
-  <!ATTLIST AudioEncoderCap minSampleRate CDATA #REQUIRED>
-  <!ATTLIST AudioEncoderCap maxSampleRate CDATA #REQUIRED>
-  <!ATTLIST AudioEncoderCap minChannels (1|2) #REQUIRED>
-  <!ATTLIST AudioEncoderCap maxChannels (1|2) #REQUIRED>
-  <!ELEMENT VideoDecoderCap EMPTY>
-  <!ATTLIST VideoDecoderCap name (wmv) #REQUIRED>
-  <!ATTLIST VideoDecoderCap enabled (true|false) #REQUIRED>
-  <!ELEMENT AudioDecoderCap EMPTY>
-  <!ATTLIST AudioDecoderCap name (wma) #REQUIRED>
-  <!ATTLIST AudioDecoderCap enabled (true|false) #REQUIRED>
-  <!ATTLIST VideoEditorCap maxInputFrameWidth CDATA #REQUIRED>
-  <!ATTLIST VideoEditorCap maxInputFrameHeight CDATA #REQUIRED>
-  <!ATTLIST VideoEditorCap maxOutputFrameWidth CDATA #REQUIRED>
-  <!ATTLIST VideoEditorCap maxOutputFrameHeight CDATA #REQUIRED>
-  <!ATTLIST VideoEditorCap maxPrefetchYUVFrames CDATA #REQUIRED>
-  <!ELEMENT ExportVideoProfile EMPTY>
-  <!ATTLIST ExportVideoProfile name (h264|h263|m4v) #REQUIRED>
-  <!ATTLIST ExportVideoProfile profile CDATA #REQUIRED>
-  <!ATTLIST ExportVideoProfile level CDATA #REQUIRED>
-]>
-<!--
-     This file is used to declare the multimedia profiles and capabilities
-     on an android-powered device.
--->
-<MediaSettings>
-  <!-- Each camcorder profile defines a set of predefined configuration parameters -->
-  <CamcorderProfiles cameraId="0">
-
-    <EncoderProfile quality="low" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="384000"
-             width="176"
-             height="144"
-             frameRate="30" />
-
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="high" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="14000000"
-             width="1920"
-             height="1080"
-             frameRate="30" />
-
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="2" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="qcif" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="384000"
-             width="176"
-             height="144"
-             frameRate="30" />
-
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="cif" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="1536000"
-             width="352"
-             height="288"
-             frameRate="30" />
-
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="480p" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="5000000"
-             width="720"
-             height="480"
-             frameRate="30" />
-
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="720p" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="8000000"
-             width="1280"
-             height="720"
-             frameRate="30" />
-
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="1080p" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="12000000"
-             width="1920"
-             height="1080"
-             frameRate="30" />
-
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="timelapselow" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="384000"
-             width="176"
-             height="144"
-             frameRate="30" />
-
-      <!--
-            The Audio part of the profile will not be used since time lapse mode
-            does not capture audio
-      -->
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="timelapsehigh" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="12000000"
-             width="1920"
-             height="1080"
-             frameRate="30" />
-
-      <!--
-            The Audio part of the profile will not be used since time lapse mode
-            does not capture audio
-      -->
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="2" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="timelapseqcif" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="384000"
-             width="176"
-             height="144"
-             frameRate="30" />
-
-      <!--
-            The Audio part of the profile will not be used since time lapse mode
-            does not capture audio
-      -->
-      <Audio codec="amrnb"
-             bitRate="12200"
-             sampleRate="8000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="timelapsecif" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="1200000"
-             width="352"
-             height="288"
-             frameRate="30" />
-
-      <!--
-            The Audio part of the profile will not be used since time lapse mode
-            does not capture audio
-      -->
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="5000000"
-             width="720"
-             height="480"
-             frameRate="30" />
-
-      <!--
-            The Audio part of the profile will not be used since time lapse mode
-            does not capture audio
-      -->
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="timelapse720p" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="8000000"
-             width="1280"
-             height="720"
-             frameRate="30" />
-
-      <!--
-            The Audio part of the profile will not be used since time lapse mode
-            does not capture audio
-      -->
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="1" />
-    </EncoderProfile>
-
-    <EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="30">
-      <Video codec="h264"
-             bitRate="12000000"
-             width="1920"
-             height="1080"
-             frameRate="30" />
-
-      <!--
-            The Audio part of the profile will not be used since time lapse mode
-            does not capture audio
-      -->
-      <Audio codec="aac"
-             bitRate="96000"
-             sampleRate="48000"
-             channels="1" />
-     </EncoderProfile>
-
-    <ImageEncoding quality="90" />
-    <ImageEncoding quality="80" />
-    <ImageEncoding quality="70" />
-    <ImageDecoding memCap="20000000" />
-
-  </CamcorderProfiles>
-
-  <EncoderOutputFileFormat name="3gp" />
-  <EncoderOutputFileFormat name="mp4" />
-
-  <!--
-         If a codec is not enabled, it is invisible to the applications
-         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="12000000"
-      minFrameWidth="176" maxFrameWidth="1920"
-      minFrameHeight="144" maxFrameHeight="1080"
-      minFrameRate="15" maxFrameRate="30" />
-
-  <VideoEncoderCap name="h263" enabled="true"
-      minBitRate="64000" maxBitRate="4000000"
-      minFrameWidth="176" maxFrameWidth="1920"
-      minFrameHeight="144" maxFrameHeight="1080"
-      minFrameRate="15" maxFrameRate="30" />
-
-  <VideoEncoderCap name="m4v" enabled="true"
-      minBitRate="64000" maxBitRate="4000000"
-      minFrameWidth="176" maxFrameWidth="1920"
-      minFrameHeight="144" maxFrameHeight="1080"
-      minFrameRate="15" maxFrameRate="30" />
-
-  <AudioEncoderCap name="aac" enabled="true"
-      minBitRate="758" maxBitRate="288000"
-      minSampleRate="8000" maxSampleRate="48000"
-      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="4750" maxBitRate="12200"
-      minSampleRate="8000" maxSampleRate="8000"
-      minChannels="1" maxChannels="1" />
-
-  <VideoDecoderCap name="wmv" enabled="false"/>
-  <AudioDecoderCap name="wma" enabled="false"/>
-  <VideoEditorCap maxInputFrameWidth="1920"
-    maxInputFrameHeight="1080"
-    maxOutputFrameWidth="1920"
-    maxOutputFrameHeight="1080"
-    maxPrefetchYUVFrames="10" />
-  <!--
-      The VideoEditor Export codec profile and level values
-      correspond to the values in OMX_Video.h.
-      E.g. for h264, profile value 1 means OMX_VIDEO_AVCProfileBaseline
-      and  level 512 means OMX_VIDEO_AVCLevel31.
-      Please note that the values are in decimal.
-      These values are for video encoder.
-  -->
-  <!--
-      Codec = h.263, Baseline profile, level 1
-  -->
-  <ExportVideoProfile name="h263" profile="1"
-   level="1" />
-  <!--
-      Codec = h.264, Baseline profile, level 4.1
-  -->
-  <ExportVideoProfile name="h264" profile="1"
-   level="4096" />
-  <!--
-      Codec = mpeg4, Simple profile, level 5
-  -->
-  <ExportVideoProfile name="m4v" profile="1"
-   level="128" />
-</MediaSettings>