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

Commit d20bf067 authored by Lakshman Gowda's avatar Lakshman Gowda Committed by Andreas Huber
Browse files

Set crop params to ANative Window during Initialization. 



The native_window_set_crop() is called when port reconfig event callback comes from decoder's and
crop parameters are changed from default getconfig() OMX_IndexConfigCommonOutputCrop values.
Since the default crop params are same as port reconfig crop params, the native_window_set_crop()
is not called, hence resulting in displaying the whole frame(paddedWidth x paddedHeight).
By calling native_window_set_crop() during initilaization of output port of decoder ensures
in setting up ANative window to crop region.

Change-Id: I68926464a1f5c7e6053804615c8b9bd32ea85688
Signed-off-by: default avatarLakshman Gowda <lakshman79@ti.com>
parent d3523f89

include/media/stagefright/OMXCodec.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -319,6 +319,8 @@ private: 
    void initOutputFormat(const sp<MetaData> &inputFormat);

    void initOutputFormat(const sp<MetaData> &inputFormat);

    status_t initNativeWindow();

    status_t initNativeWindow();





    void initNativeWindowCrop();



    void dumpPortStatus(OMX_U32 portIndex);

    void dumpPortStatus(OMX_U32 portIndex);





    status_t configureCodec(const sp<MetaData> &meta);

    status_t configureCodec(const sp<MetaData> &meta);

media/libstagefright/OMXCodec.cpp

+22 −16
Original line number Original line Diff line number Diff line
@@ -2351,22 +2351,6 @@ void OMXCodec::onEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2) { 
                    formatHasNotablyChanged(oldOutputFormat, mOutputFormat)) {

                    formatHasNotablyChanged(oldOutputFormat, mOutputFormat)) {

                    mOutputPortSettingsHaveChanged = true;

                    mOutputPortSettingsHaveChanged = true;





                    if (mNativeWindow != NULL) {

                        int32_t left, top, right, bottom;

                        CHECK(mOutputFormat->findRect(

                                    kKeyCropRect,

                                    &left, &top, &right, &bottom));



                        android_native_rect_t crop;

                        crop.left = left;

                        crop.top = top;

                        crop.right = right + 1;

                        crop.bottom = bottom + 1;



                        // We'll ignore any errors here, if the surface is

                        // already invalid, we'll know soon enough.

                        native_window_set_crop(mNativeWindow.get(), &crop);

                    }

                } else if (data2 == OMX_IndexConfigCommonScale) {

                } else if (data2 == OMX_IndexConfigCommonScale) {

                    OMX_CONFIG_SCALEFACTORTYPE scale;

                    OMX_CONFIG_SCALEFACTORTYPE scale;

                    InitOMXParams(&scale);

                    InitOMXParams(&scale);
@@ -4183,6 +4167,24 @@ status_t OMXCodec::initNativeWindow() { 
    return OK;

    return OK;

}

}





void OMXCodec::initNativeWindowCrop() {

    int32_t left, top, right, bottom;



    CHECK(mOutputFormat->findRect(

                        kKeyCropRect,

                        &left, &top, &right, &bottom));



    android_native_rect_t crop;

    crop.left = left;

    crop.top = top;

    crop.right = right + 1;

    crop.bottom = bottom + 1;



    // We'll ignore any errors here, if the surface is

    // already invalid, we'll know soon enough.

    native_window_set_crop(mNativeWindow.get(), &crop);

}



void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) {

void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) {

    mOutputFormat = new MetaData;

    mOutputFormat = new MetaData;

    mOutputFormat->setCString(kKeyDecoderComponent, mComponentName);

    mOutputFormat->setCString(kKeyDecoderComponent, mComponentName);
@@ -4366,6 +4368,10 @@ void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) { 
                            video_def->nFrameWidth - 1,

                            video_def->nFrameWidth - 1,

                            video_def->nFrameHeight - 1);

                            video_def->nFrameHeight - 1);

                }

                }



                if (mNativeWindow != NULL) {

                     initNativeWindowCrop();

                }

            }

            }

            break;

            break;

        }

        }