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

Commit 7c16991d authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am 5fd39f77: Merge "MediaCodecInfo: report supported color formats for... 

am 5fd39f77: Merge "MediaCodecInfo: report supported color formats for non-native-window mode" into klp-dev

* commit '5fd39f77':
  MediaCodecInfo: report supported color formats for non-native-window mode
parents 0fb0400b 5fd39f77

media/libstagefright/OMXCodec.cpp

+6 −6
Original line number Diff line number Diff line
@@ -4585,12 +4585,6 @@ status_t QueryCodec( 
    caps->mFlags = 0;

    caps->mComponentName = componentName;



    if (!isEncoder && !strncmp(mime, "video/", 6) &&

            omx->storeMetaDataInBuffers(

                    node, 1 /* port index */, OMX_TRUE) == OK) {

        caps->mFlags |= CodecCapabilities::kFlagSupportsAdaptivePlayback;

    }



    OMX_VIDEO_PARAM_PROFILELEVELTYPE param;

    InitOMXParams(&param);
@@ -4626,6 +4620,12 @@ status_t QueryCodec( 
        caps->mColorFormats.push(portFormat.eColorFormat);

    }



    if (!isEncoder && !strncmp(mime, "video/", 6) &&

            omx->storeMetaDataInBuffers(

                    node, 1 /* port index */, OMX_TRUE) == OK) {

        caps->mFlags |= CodecCapabilities::kFlagSupportsAdaptivePlayback;

    }



    CHECK_EQ(omx->freeNode(node), (status_t)OK);



    return OK;