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

Commit ee4e7fa5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reset staticInfo if static meta fetch fails" am: c09e47c2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2638955



Change-Id: I73fe2be1aa9c389a4b7b15aa1781742970054da2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents affaf68f c09e47c2

media/codec2/sfplugin/Codec2Buffer.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -1175,6 +1175,11 @@ c2_status_t GetHdrMetadataFromGralloc4Handle( 
            err = C2_CORRUPTED;

            err = C2_CORRUPTED;

        }

        }

    }

    }



    if (err != C2_OK) {

        staticInfo->reset();

    }



    if (dynamicInfo) {

    if (dynamicInfo) {

        ALOGV("Grabbing dynamic HDR info from gralloc4 metadata");

        ALOGV("Grabbing dynamic HDR info from gralloc4 metadata");

        dynamicInfo->reset();

        dynamicInfo->reset();