diff options
| author | Andreas Huber <andih@google.com> | 2010-10-07 13:57:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-07 13:57:08 -0700 |
| commit | fa6a5d481474ba11517c8d0eb6431595d387b81e (patch) | |
| tree | d801228880aa603b27a73dd6a7d26cd269ae671e /media/libstagefright | |
| parent | 173e75df12ad5398f3650a30e430dcac0cbcf278 (diff) | |
| parent | a240812f10335fe4c8677da824293b7e04aad7e9 (diff) | |
| download | frameworks_av-fa6a5d481474ba11517c8d0eb6431595d387b81e.zip frameworks_av-fa6a5d481474ba11517c8d0eb6431595d387b81e.tar.gz frameworks_av-fa6a5d481474ba11517c8d0eb6431595d387b81e.tar.bz2 | |
Merge "Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback."
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 23 | ||||
| -rw-r--r-- | media/libstagefright/colorconversion/SoftwareRenderer.cpp | 3 |
2 files changed, 26 insertions, 0 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 4d69dd3..a5341e3 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1838,8 +1838,31 @@ void OMXCodec::onEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2) { case OMX_EventPortSettingsChanged: { + CODEC_LOGV("OMX_EventPortSettingsChanged(port=%ld, data2=0x%08lx)", + data1, data2); + if (data2 == 0 || data2 == OMX_IndexParamPortDefinition) { onPortSettingsChanged(data1); + } else if (data1 == kPortIndexOutput + && data2 == OMX_IndexConfigCommonOutputCrop) { + + OMX_CONFIG_RECTTYPE rect; + rect.nPortIndex = kPortIndexOutput; + InitOMXParams(&rect); + + status_t err = + mOMX->getConfig( + mNode, OMX_IndexConfigCommonOutputCrop, + &rect, sizeof(rect)); + + if (err == OK) { + CODEC_LOGV( + "output crop (%ld, %ld, %ld, %ld)", + rect.nLeft, rect.nTop, rect.nWidth, rect.nHeight); + } else { + CODEC_LOGE("getConfig(OMX_IndexConfigCommonOutputCrop) " + "returned error 0x%08x", err); + } } break; } diff --git a/media/libstagefright/colorconversion/SoftwareRenderer.cpp b/media/libstagefright/colorconversion/SoftwareRenderer.cpp index c204a94..662a84a 100644 --- a/media/libstagefright/colorconversion/SoftwareRenderer.cpp +++ b/media/libstagefright/colorconversion/SoftwareRenderer.cpp @@ -48,6 +48,9 @@ SoftwareRenderer::SoftwareRenderer( LOGI("display = %d x %d, decoded = %d x %d", mDisplayWidth, mDisplayHeight, mDecodedWidth, mDecodedHeight); + mDecodedWidth = mDisplayWidth; + mDecodedHeight = mDisplayHeight; + int halFormat; switch (mColorFormat) { #if HAS_YCBCR420_SP_ADRENO |