summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-10-31 12:26:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-31 12:26:28 +0000
commit31d7df5ac8593be043fe51f08760f550fc0266d1 (patch)
treef7b11696179ec923b341e0c9701162a3ecdc96ac
parentb412f5a1c2a8ceb86d35a7d981fc933d4a9a6c4a (diff)
parentc19ffed4e1c63e85350a56ab07e2ba06c829a6ba (diff)
downloaddevice_samsung_tuna-31d7df5ac8593be043fe51f08760f550fc0266d1.zip
device_samsung_tuna-31d7df5ac8593be043fe51f08760f550fc0266d1.tar.gz
device_samsung_tuna-31d7df5ac8593be043fe51f08760f550fc0266d1.tar.bz2
am c913dc64: am 490e9455: Merge "Limit output bitrate from 1080P video recording to 12Mbps" into ics-mr0
* commit 'c19ffed4e1c63e85350a56ab07e2ba06c829a6ba': Limit output bitrate from 1080P video recording to 12Mbps
-rwxr-xr-xmedia_profiles.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/media_profiles.xml b/media_profiles.xml
index 28cb2c2..4a6eb46 100755
--- a/media_profiles.xml
+++ b/media_profiles.xml
@@ -138,7 +138,7 @@
<EncoderProfile quality="1080p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="17000000"
+ bitRate="12000000"
width="1920"
height="1080"
frameRate="30" />
@@ -202,7 +202,7 @@
<EncoderProfile quality="timelapse1080p" fileFormat="mp4" duration="30">
<Video codec="h264"
- bitRate="17000000"
+ bitRate="12000000"
width="1920"
height="1080"
frameRate="30" />
@@ -338,7 +338,7 @@
or query the capabilities of the codec at all if it is disabled
-->
<VideoEncoderCap name="h264" enabled="true"
- minBitRate="64000" maxBitRate="17000000"
+ minBitRate="64000" maxBitRate="12000000"
minFrameWidth="176" maxFrameWidth="1920"
minFrameHeight="144" maxFrameHeight="1080"
minFrameRate="15" maxFrameRate="30" />