diff options
| author | Chong Zhang <chz@google.com> | 2015-05-30 00:01:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-30 00:02:56 +0000 |
| commit | 2b92be86a67ee61c2d6fbcab6160dad012808074 (patch) | |
| tree | 8caae04557c9e0b4d914b09122cb21d9629b3202 | |
| parent | 853680254b21fcd10920d7aac7ea8c65e6c7d9d6 (diff) | |
| parent | 5dff4700d06f000ae39e04d8ae1554a19f59c2a3 (diff) | |
| download | flo-2b92be86a67ee61c2d6fbcab6160dad012808074.tar.gz | |
Merge "remove video editor from media_profiles.xml" into mnc-dev
| -rw-r--r-- | media_profiles.xml | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/media_profiles.xml b/media_profiles.xml index 98362ed..0a32128 100644 --- a/media_profiles.xml +++ b/media_profiles.xml @@ -70,16 +70,6 @@ <!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> ]> <!-- This file is used to declare the multimedia profiles and capabilities @@ -390,39 +380,4 @@ --> <VideoDecoderCap name="wmv" enabled="false"/> <AudioDecoderCap name="wma" enabled="false"/> - - <!-- - The VideoEditor Capability configuration: - - maxInputFrameWidth: maximum video width of imported video clip. - - maxInputFrameHeight: maximum video height of imported video clip. - - maxOutputFrameWidth: maximum video width of exported video clip. - - maxOutputFrameHeight: maximum video height of exported video clip. - - maxPrefetchYUVFrames: maximum prefetch YUV frames for encoder, - used to limit the amount of memory for prefetched YUV frames. - For this platform, it allows maximum 30MB(3MB per 1080p frame x 10 - frames) memory. - --> - <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 4096 means OMX_VIDEO_AVCLevel41. - Please note that the values are in decimal. - These values are for video encoder. - --> - <!-- - Codec = h.264, Baseline profile, level 4.0 - --> - <ExportVideoProfile name="h264" profile= "1" level="2048"/> - <!-- - Codec = h.263, Baseline profile, level 70 - --> - <ExportVideoProfile name="h263" profile= "1" level="128"/> - <!-- - Codec = mpeg4, Simple profile, level 5 - --> - <ExportVideoProfile name="m4v" profile= "1" level="128"/> </MediaSettings> |