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

Commit fa7e9674 authored by Chia-I Wu's avatar Chia-I Wu
Browse files

Fix QueueBufferInput conversion 

android::IGraphicBufferProducer::QueueBufferInput gained HdrMetadata
and is now out-of-sync with
android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput.

Bug: 71626558
Test: manual
Change-Id: I2f04d3bd8b1a50c3be1be382f47cdbf73ea4f474
parent 8bd398d5

media/libstagefright/omx/include/media/stagefright/omx/1.0/Conversion.h

+9 −2
Original line number Diff line number Diff line
@@ -1862,7 +1862,8 @@ constexpr size_t minFlattenedSize( 
inline size_t getFlattenedSize(HGraphicBufferProducer::QueueBufferInput const& t) {

    return minFlattenedSize(t) +

            getFenceFlattenedSize(t.fence) +

            getFlattenedSize(t.surfaceDamage);

            getFlattenedSize(t.surfaceDamage) +

            sizeof(HdrMetadata::validTypes);

}



/**
@@ -1916,7 +1917,12 @@ inline status_t flatten(HGraphicBufferProducer::QueueBufferInput const& t, 
    if (status != NO_ERROR) {

        return status;

    }

    return flatten(t.surfaceDamage, buffer, size);

    status = flatten(t.surfaceDamage, buffer, size);

    if (status != NO_ERROR) {

        return status;

    }

    FlattenableUtils::write(buffer, size, decltype(HdrMetadata::validTypes)(0));

    return NO_ERROR;

}



/**
@@ -1968,6 +1974,7 @@ inline status_t unflatten( 
    if (status != NO_ERROR) {

        return status;

    }

    // HdrMetadata ignored

    return unflatten(&(t->surfaceDamage), buffer, size);

}