Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6e9d769 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Some instrumentation of OMXCodec for future investigation and a... 

Merge "Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback."
parents 6a5fc4bc 08478d17

media/libstagefright/OMXCodec.cpp

+23 −0
Original line number Diff line number Diff line
@@ -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;

        }

media/libstagefright/colorconversion/SoftwareRenderer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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