diff options
| author | Lajos Molnar <lajos@google.com> | 2014-11-20 21:22:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-20 21:22:30 +0000 |
| commit | 3efe6516acd0561cc1afef1c3192600b3ab81166 (patch) | |
| tree | d0c246416d5a91b015a26dca3fe03f95f71b3ef6 /media/libstagefright/ACodec.cpp | |
| parent | dcdc76994c150c09aadc5be8f86040ebc6865706 (diff) | |
| parent | 73c5c94ab53bf0c14fffe5edc62706865cff271d (diff) | |
| download | frameworks_av-3efe6516acd0561cc1afef1c3192600b3ab81166.zip frameworks_av-3efe6516acd0561cc1afef1c3192600b3ab81166.tar.gz frameworks_av-3efe6516acd0561cc1afef1c3192600b3ab81166.tar.bz2 | |
am 6597c00f: stagefright: add (temporary) support for automatic video frc
automerge: 73c5c94
* commit '73c5c94ab53bf0c14fffe5edc62706865cff271d':
stagefright: add (temporary) support for automatic video frc
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 26284e9..73abca7 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -1268,6 +1268,24 @@ status_t ACodec::configureCodec( static_cast<NativeWindowWrapper *>(obj.get())); sp<ANativeWindow> nativeWindow = windowWrapper->getNativeWindow(); + // START of temporary support for automatic FRC - THIS WILL BE REMOVED + int32_t autoFrc; + if (msg->findInt32("auto-frc", &autoFrc)) { + bool enabled = autoFrc; + OMX_CONFIG_BOOLEANTYPE config; + InitOMXParams(&config); + config.bEnabled = (OMX_BOOL)enabled; + status_t temp = mOMX->setConfig( + mNode, (OMX_INDEXTYPE)OMX_IndexConfigAutoFramerateConversion, + &config, sizeof(config)); + if (temp == OK) { + outputFormat->setInt32("auto-frc", enabled); + } else if (enabled) { + ALOGI("codec does not support requested auto-frc (err %d)", temp); + } + } + // END of temporary support for automatic FRC + int32_t tunneled; if (msg->findInt32("feature-tunneled-playback", &tunneled) && tunneled != 0) { |