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

Commit 2c7ddbcd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add support for HLG HDR video thumbnails" into rvc-dev am: 1cd41d5c 

Change-Id: I1e5d225278e7a3640a99509c4c3bf79b954a624d
parents 502a6045 1cd41d5c

media/libstagefright/FrameCaptureLayer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ ui::Dataspace translateDataspace(ui::Dataspace dataspace) { 
bool isHdrY410(const BufferItem &bi) {

    ui::Dataspace dataspace = translateDataspace(static_cast<ui::Dataspace>(bi.mDataSpace));

    // pixel format is HDR Y410 masquerading as RGBA_1010102

    return (dataspace == ui::Dataspace::BT2020_ITU_PQ &&

    return ((dataspace == ui::Dataspace::BT2020_ITU_PQ ||

            dataspace == ui::Dataspace::BT2020_ITU_HLG) &&

            bi.mGraphicBuffer->getPixelFormat() == HAL_PIXEL_FORMAT_RGBA_1010102);

}

media/libstagefright/FrameDecoder.cpp

+2 −1
Original line number Diff line number Diff line
@@ -248,7 +248,8 @@ bool isHDR(const sp<AMessage> &format) { 
        transfer = 0;

    }

    return standard == ColorUtils::kColorStandardBT2020 &&

            transfer == ColorUtils::kColorTransferST2084;

            (transfer == ColorUtils::kColorTransferST2084 ||

            transfer == ColorUtils::kColorTransferHLG);

}



status_t FrameDecoder::init(