diff options
| author | Lajos Molnar <lajos@google.com> | 2013-09-18 17:31:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-18 17:31:18 +0000 |
| commit | ab6c93b4bea96dc4f44a7acfefee1e11a3abda5b (patch) | |
| tree | e04575d5872aaf0238d37397f55092c2b6dca96b /media | |
| parent | 6cc3a9948b51193dfdcb0c3527d7f3d1ca38aa3c (diff) | |
| parent | 530fdbdc1b5491f3fbf172752834d1515701e142 (diff) | |
| download | frameworks_av-ab6c93b4bea96dc4f44a7acfefee1e11a3abda5b.zip frameworks_av-ab6c93b4bea96dc4f44a7acfefee1e11a3abda5b.tar.gz frameworks_av-ab6c93b4bea96dc4f44a7acfefee1e11a3abda5b.tar.bz2 | |
Merge "Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value" into klp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/wifi-display/source/Converter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 5c3abd0..bfb730c 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -4134,7 +4134,7 @@ bool ACodec::ExecutingState::onMessageReceived(const sp<AMessage> &msg) { status_t ACodec::setParameters(const sp<AMessage> ¶ms) { int32_t videoBitrate; - if (params->findInt32("videoBitrate", &videoBitrate)) { + if (params->findInt32("video-bitrate", &videoBitrate)) { OMX_VIDEO_CONFIG_BITRATETYPE configParams; InitOMXParams(&configParams); configParams.nPortIndex = kPortIndexOutput; diff --git a/media/libstagefright/wifi-display/source/Converter.cpp b/media/libstagefright/wifi-display/source/Converter.cpp index 6f23854..753b3ec 100644 --- a/media/libstagefright/wifi-display/source/Converter.cpp +++ b/media/libstagefright/wifi-display/source/Converter.cpp @@ -833,7 +833,7 @@ int32_t Converter::getVideoBitrate() const { void Converter::setVideoBitrate(int32_t bitRate) { if (mIsVideo && mEncoder != NULL && bitRate != mPrevVideoBitrate) { sp<AMessage> params = new AMessage; - params->setInt32("videoBitrate", bitRate); + params->setInt32("video-bitrate", bitRate); mEncoder->setParameters(params); |