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

Commit 0969354b authored by Ram Mohan M's avatar Ram Mohan M
Browse files

MediaCodec: Signal crop attrb correctly to MediaImage during instantiation 

The getOutputImage() of MediaCodec API translates the decoded image data
and MediaImage2 metadata to MediaImage. MediaImage is constructed by
copying only the display section of the decoded data. For images with
cropRect set, the display section needs to be correctly identified with
fields xOffset and yOffset which correspond to cropLeft and cropTop
respectively. This was missing causing issues in the final image
received from the API. This is addressed.

Bug: 163299340
Test: atest CtsMediaV2TestCases:CodecDecoderValidationTest
Test: atest MctsMediaV2TestCases:CodecDecoderValidationTest
Flag: EXEMPT bugfix
Change-Id: I99b92821f7585da2504dfc66df7af8fc96941fdd
parent cfa9a2a5

media/jni/android_media_MediaCodec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ status_t JMediaCodec::getImage( 
    }



    jobject cropRect = NULL;

    int32_t left, top, right, bottom;

    int32_t left = 0, top = 0, right = 0, bottom = 0;

    if (buffer->meta()->findRect("crop-rect", &left, &top, &right, &bottom)) {

        ScopedLocalRef<jclass> rectClazz(

                env, env->FindClass("android/graphics/Rect"));
@@ -776,7 +776,7 @@ status_t JMediaCodec::getImage( 
            byteBuffer, infoBuffer,

            (jboolean)!input /* readOnly */,

            (jlong)timestamp,

            (jint)0 /* xOffset */, (jint)0 /* yOffset */, cropRect);

            left /* xOffset */, top /* yOffset */, cropRect);



    // if MediaImage creation fails, return null

    if (env->ExceptionCheck()) {