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

Commit 4884ed4e 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 am: ee4e7fa5 

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



Change-Id: Ia3598323d7b0928911a98d91f71f3534a4ab72e1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47e799e3 ee4e7fa5

media/codec2/sfplugin/Codec2Buffer.cpp

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

        }

    }



    if (err != C2_OK) {

        staticInfo->reset();

    }



    if (dynamicInfo) {

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

        dynamicInfo->reset();