summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-08-05 19:57:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-05 19:57:03 +0000
commitaf7d737090a5c1d499b7dcbf54b795ad2f979ec2 (patch)
treee2505d1ea97cd9338d6f8052b5fe36b7b7c33268 /media
parent0805add748f6857cb7537a1e16562f59dc96e334 (diff)
parent98a421bfffe6b3a1b762d11740e90787bdfeac08 (diff)
downloadframeworks_av-af7d737090a5c1d499b7dcbf54b795ad2f979ec2.zip
frameworks_av-af7d737090a5c1d499b7dcbf54b795ad2f979ec2.tar.gz
frameworks_av-af7d737090a5c1d499b7dcbf54b795ad2f979ec2.tar.bz2
Merge "ACodec: send format change for video tunneled mode when omx has output crop change." into mnc-dev
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/ACodec.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 3e65686..fb654b8 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -6374,6 +6374,11 @@ bool ACodec::ExecutingState::onOMXEvent(
mCodec->changeState(mCodec->mOutputPortSettingsChangedState);
} else if (data2 == OMX_IndexConfigCommonOutputCrop) {
mCodec->mSentFormat = false;
+
+ if (mCodec->mTunneled) {
+ sp<AMessage> dummy = new AMessage(kWhatOutputBufferDrained, mCodec);
+ mCodec->sendFormatChange(dummy);
+ }
} else {
ALOGV("[%s] OMX_EventPortSettingsChanged 0x%08x",
mCodec->mComponentName.c_str(), data2);