diff options
| author | Chong Zhang <chz@google.com> | 2015-05-30 00:01:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-30 00:01:42 +0000 |
| commit | 32b4b27b0fbedab32697996af023ba39793a5bd4 (patch) | |
| tree | b1fb530fff2e1625d3563b796fe3739e3663d591 | |
| parent | e4b5058d2e09f95345b4e345b139e9084ad2de30 (diff) | |
| parent | 7d8b2d37bc449bfd94b47bedccabfc3a55b00917 (diff) | |
| download | android_device_generic_goldfish-32b4b27b0fbedab32697996af023ba39793a5bd4.tar.gz android_device_generic_goldfish-32b4b27b0fbedab32697996af023ba39793a5bd4.tar.bz2 android_device_generic_goldfish-32b4b27b0fbedab32697996af023ba39793a5bd4.zip | |
Merge "remove video editor from media_profiles.xml" into mnc-dev
| -rw-r--r-- | camera/media_profiles.xml | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/camera/media_profiles.xml b/camera/media_profiles.xml index 42ceb8d..cd99857 100644 --- a/camera/media_profiles.xml +++ b/camera/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 @@ -375,40 +365,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 ~1MB(~0.1MB per QVGA frame x 10 - frames) memory. - --> - - <VideoEditorCap maxInputFrameWidth="320" - maxInputFrameHeight="240" maxOutputFrameWidth="320" - maxOutputFrameHeight="240" 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.1 - --> - <ExportVideoProfile name="h264" profile= "1" level="512"/> - <!-- - Codec = h.263, Baseline profile, level 0 - --> - <ExportVideoProfile name="h263" profile= "1" level="1"/> - <!-- - Codec = mpeg4, Simple profile, level 3 - --> - <ExportVideoProfile name="m4v" profile= "1" level="16"/> </MediaSettings> |