summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawin Vongmasa <pawin@google.com>2017-05-03 19:54:12 -0700
committerArian <arian.kulmer@web.de>2019-10-25 22:16:12 +0200
commit6b1de054c028cf9142f393d94c59e65e34605f13 (patch)
treeb282644d2b052572f49f8946da441be01c1c936b
parentcf0c138396fbbade56f99da01653d6c47ef1ae94 (diff)
shinano: media: Create media_profiles_V1_0.xml
media_profiles_V1_0.xml is created from media_profiles.xml by replacing the dtd schema inside media_profiles.xml with an external reference to /system/etc/media_profiles_V1_0.dtd. Test: Compiles Bug: 36430270 From: Pawin Vongmasa <pawin@google.com> Date: Wed May 03 22:42:57 2017 -0700 Remove the property media.settings.xml. This CL also removes media_profiles.xml as it should be replaced by media_profiles_V1_0.xml. Bug: 36430270 Merged-In: I4299abfde44ced36560736520d0be592894d00a7 Change-Id: I4299abfde44ced36560736520d0be592894d00a7 Merged-In: I2bdd38bc8e85cdb64c4729a6ebc843f5031c127c Change-Id: I2bdd38bc8e85cdb64c4729a6ebc843f5031c127c Signed-off-by: Chippa-a <vusal1372@gmail.com> Signed-off-by: Adrian DC <radian.dc@gmail.com>
-rw-r--r--media_profiles_V1_0.xml (renamed from media_profiles.xml)75
-rw-r--r--shinano.mk2
2 files changed, 2 insertions, 75 deletions
diff --git a/media_profiles.xml b/media_profiles_V1_0.xml
index 6ef1408..118a15f 100644
--- a/media_profiles.xml
+++ b/media_profiles_V1_0.xml
@@ -17,80 +17,7 @@
NOTE: This file has been modified by Sony Ericsson Mobile Communications AB /
Sony Mobile Communications AB. Modifications are licensed 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) #REQUIRED>
-<!ATTLIST EncoderProfile fileFormat (mp4|3gp) #REQUIRED>
-<!ATTLIST EncoderProfile duration (30|60) #REQUIRED>
-<!ATTLIST EncoderProfile cameraId (0|1) #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>
-<!ATTLIST VideoEncoderCap maxHFRFrameWidth CDATA #REQUIRED>
-<!ATTLIST VideoEncoderCap maxHFRFrameHeight CDATA #REQUIRED>
-<!ATTLIST VideoEncoderCap maxHFRMode 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>
-<!ELEMENT VideoEditorCap EMPTY>
-<!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>
-]>
+<!DOCTYPE MediaSettings SYSTEM "/system/etc/media_profiles_V1_0.dtd">
<!--
This file is used to declare the multimedia profiles and capabilities
on an android-powered device.
diff --git a/shinano.mk b/shinano.mk
index e6ed496..71c0c21 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -94,7 +94,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
$(COMMON_PATH)/media_codecs.xml:system/etc/media_codecs.xml \
$(COMMON_PATH)/media_codecs_performance.xml:system/etc/media_codecs_performance.xml \
- $(COMMON_PATH)/media_profiles.xml:system/etc/media_profiles.xml
+ $(COMMON_PATH)/media_profiles_V1_0.xml:system/etc/media_profiles_V1_0.xml
# Bluetooth
PRODUCT_COPY_FILES += \