Merge "media_profile: update encode parameters" into jb

This commit is contained in:
Linux Build Service Account 2012-07-14 19:20:00 -07:00 committed by QuIC Gerrit Code Review
commit 4c8592cf43
1 changed files with 13 additions and 13 deletions

View File

@ -146,7 +146,7 @@
<Video codec="h264"
bitRate="12000000"
width="1920"
height="1080"
height="1088"
frameRate="30" />
<Audio codec="aac"
bitRate="96000"
@ -210,7 +210,7 @@
<Video codec="h264"
bitRate="12000000"
width="1920"
height="1080"
height="1088"
frameRate="30" />
<!-- audio setting is ignored -->
<Audio codec="aac"
@ -344,21 +344,21 @@
or query the capabilities of the codec at all if it is disabled
-->
<VideoEncoderCap name="h264" enabled="true"
minBitRate="64000" maxBitRate="12000000"
minBitRate="64000" maxBitRate="20000000"
minFrameWidth="176" maxFrameWidth="1920"
minFrameHeight="144" maxFrameHeight="1080"
minFrameHeight="144" maxFrameHeight="1088"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="h263" enabled="true"
minBitRate="64000" maxBitRate="4000000"
minFrameWidth="176" maxFrameWidth="1920"
minFrameHeight="144" maxFrameHeight="1080"
minBitRate="64000" maxBitRate="2000000"
minFrameWidth="176" maxFrameWidth="800"
minFrameHeight="144" maxFrameHeight="480"
minFrameRate="15" maxFrameRate="30" />
<VideoEncoderCap name="m4v" enabled="true"
minBitRate="64000" maxBitRate="4000000"
minBitRate="64000" maxBitRate="20000000"
minFrameWidth="176" maxFrameWidth="1920"
minFrameHeight="144" maxFrameHeight="1080"
minFrameHeight="144" maxFrameHeight="1088"
minFrameRate="15" maxFrameRate="30" />
<AudioEncoderCap name="aac" enabled="true"
@ -398,8 +398,8 @@
frames) memory.
-->
<VideoEditorCap maxInputFrameWidth="1920"
maxInputFrameHeight="1080" maxOutputFrameWidth="1920"
maxOutputFrameHeight="1080" maxPrefetchYUVFrames="10"/>
maxInputFrameHeight="1088" maxOutputFrameWidth="1920"
maxOutputFrameHeight="1088" maxPrefetchYUVFrames="10"/>
<!--
The VideoEditor Export codec profile and level values
correspond to the values in OMX_Video.h.
@ -411,7 +411,7 @@
<!--
Codec = h.264, Baseline profile, level 4.1
-->
<ExportVideoProfile name="h264" profile= "1" level="4096"/>
<ExportVideoProfile name="h264" profile= "1" level="1"/>
<!--
Codec = h.263, Baseline profile, level 0
-->
@ -419,5 +419,5 @@
<!--
Codec = mpeg4, Simple profile, level 5
-->
<ExportVideoProfile name="m4v" profile= "1" level="128"/>
<ExportVideoProfile name="m4v" profile= "1" level="1"/>
</MediaSettings>