summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRajneesh Chowdury <rajneeshc@google.com>2011-11-15 18:17:36 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-15 18:17:36 -0800
commit6ec6e4df4422e44acfbdddf8a39bd3a7134107e7 (patch)
treed28ad96d273acf1b40139a138a60e3ce1346a9df
parent4ccf6748bbdffb3ffaa652f91730acd17e5a658c (diff)
parentaa3b7f53eb003876445591d904ee6acbe1d7a055 (diff)
downloaddevice_samsung_crespo-6ec6e4df4422e44acfbdddf8a39bd3a7134107e7.zip
device_samsung_crespo-6ec6e4df4422e44acfbdddf8a39bd3a7134107e7.tar.gz
device_samsung_crespo-6ec6e4df4422e44acfbdddf8a39bd3a7134107e7.tar.bz2
am aa3b7f53: Merge "Fix for 5603113 profiles and levels in media_profile.xml are not matched with the HW codec capability." into ics-mr1
* commit 'aa3b7f53eb003876445591d904ee6acbe1d7a055': Fix for 5603113 profiles and levels in media_profile.xml are not matched with the HW codec capability.
-rw-r--r--media_profiles.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/media_profiles.xml b/media_profiles.xml
index 2ff2124..67fe1a1 100644
--- a/media_profiles.xml
+++ b/media_profiles.xml
@@ -282,20 +282,20 @@
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 256 means OMX_VIDEO_AVCLevel3.
+ and level 2048 means OMX_VIDEO_AVCLevel4.
Please note that the values are in decimal.
These values are for video encoder.
-->
<!--
- Codec = h.264, Baseline profile, level 3
+ Codec = h.264, Baseline profile, level 4
-->
- <ExportVideoProfile name="h264" profile= "1" level="256"/>
+ <ExportVideoProfile name="h264" profile= "1" level="2048"/>
<!--
Codec = h.263, Baseline profile, level 0
-->
<ExportVideoProfile name="h263" profile= "1" level="1"/>
<!--
- Codec = mpeg4, Simple profile, level 3
+ Codec = mpeg4, Simple profile, level 5
-->
- <ExportVideoProfile name="m4v" profile= "1" level="16"/>
+ <ExportVideoProfile name="m4v" profile= "1" level="128"/>
</MediaSettings>