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

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

Merge "fix send null static meta to VENC when HDR Editing" into main am: 3cf4c5b8 am: 188007a6 

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



Change-Id: I7e266f5e2659cebc8516534ce78e77bf9242208f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98e5e518 188007a6

media/codec2/sfplugin/Codec2Buffer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1144,7 +1144,7 @@ c2_status_t GetHdrMetadataFromGralloc4Handle( 


        std::optional<Smpte2086> smpte2086;

        status_t status = mapper.getSmpte2086(buffer.get(), &smpte2086);

        if (status != OK) {

        if (status != OK || !smpte2086) {

            err = C2_CORRUPTED;

        } else {

            if (smpte2086) {
@@ -1164,7 +1164,7 @@ c2_status_t GetHdrMetadataFromGralloc4Handle( 


        std::optional<Cta861_3> cta861_3;

        status = mapper.getCta861_3(buffer.get(), &cta861_3);

        if (status != OK) {

        if (status != OK || !cta861_3) {

            err = C2_CORRUPTED;

        } else {

            if (cta861_3) {
@@ -1183,7 +1183,7 @@ c2_status_t GetHdrMetadataFromGralloc4Handle( 
        dynamicInfo->reset();

        std::optional<std::vector<uint8_t>> vec;

        status_t status = mapper.getSmpte2094_40(buffer.get(), &vec);

        if (status != OK) {

        if (status != OK || !vec) {

            dynamicInfo->reset();

            err = C2_CORRUPTED;

        } else {