diff options
| author | Hong Teng <hongteng@google.com> | 2011-11-15 09:43:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-15 09:43:03 -0800 |
| commit | 5bc7ffa38e4bce801c2d8c828d3809c00d2fb0c4 (patch) | |
| tree | b108483ca14389cf64e4bf702542e3bf8d6ab5fc /media_profiles.xml | |
| parent | 5c570a5fba7509bd4912f7d2b7ca948faab9fd91 (diff) | |
| parent | aeb797814a45fca52676dfc293ab9bfc6092a8ef (diff) | |
| download | device_samsung_crespo-5bc7ffa38e4bce801c2d8c828d3809c00d2fb0c4.zip device_samsung_crespo-5bc7ffa38e4bce801c2d8c828d3809c00d2fb0c4.tar.gz device_samsung_crespo-5bc7ffa38e4bce801c2d8c828d3809c00d2fb0c4.tar.bz2 | |
Merge " Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
Diffstat (limited to 'media_profiles.xml')
| -rw-r--r-- | media_profiles.xml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/media_profiles.xml b/media_profiles.xml index b59682e..2ff2124 100644 --- a/media_profiles.xml +++ b/media_profiles.xml @@ -75,6 +75,7 @@ <!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> @@ -263,9 +264,20 @@ --> <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 8MB(1.3MB per 720p frame x 6 + frames) memory. + --> <VideoEditorCap maxInputFrameWidth="1280" maxInputFrameHeight="720" maxOutputFrameWidth="1280" - maxOutputFrameHeight="720"/> + maxOutputFrameHeight="720" maxPrefetchYUVFrames="6"/> <!-- The VideoEditor Export codec profile and level values correspond to the values in OMX_Video.h. |