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

Commit 682cbf5b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove YV410 interpretation of RGBA_1010102 buffers" into udc-dev

parents aa415dc2 fd36dc6d

media/codec2/hal/plugin/samples/SampleFilterPlugin.cpp

+0 −4
Original line number Original line Diff line number Diff line
@@ -710,10 +710,6 @@ private: 
                layerSettings.source.buffer.fence = Fence::NO_FENCE;

                layerSettings.source.buffer.fence = Fence::NO_FENCE;

                layerSettings.source.buffer.textureName = textureName;

                layerSettings.source.buffer.textureName = textureName;

                layerSettings.source.buffer.usePremultipliedAlpha = false;

                layerSettings.source.buffer.usePremultipliedAlpha = false;

                layerSettings.source.buffer.isY410BT2020 =

                    (layerSettings.sourceDataspace == ui::Dataspace::BT2020_ITU_PQ ||

                     layerSettings.sourceDataspace == ui::Dataspace::BT2020_ITU_HLG) &&

                    format == HAL_PIXEL_FORMAT_RGBA_1010102;

                layerSettings.source.buffer.maxMasteringLuminance =

                layerSettings.source.buffer.maxMasteringLuminance =

                    (hdrStaticInfo && *hdrStaticInfo &&

                    (hdrStaticInfo && *hdrStaticInfo &&

                     hdrStaticInfo->mastering.maxLuminance > 0 &&

                     hdrStaticInfo->mastering.maxLuminance > 0 &&

media/libstagefright/FrameCaptureLayer.cpp

+0 −9
Original line number Original line Diff line number Diff line
@@ -64,14 +64,6 @@ ui::Dataspace translateDataspace(ui::Dataspace dataspace) { 
    return updatedDataspace;

    return updatedDataspace;

}

}





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 ||

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

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

}



struct FrameCaptureLayer::BufferLayer : public FrameCaptureProcessor::Layer {

struct FrameCaptureLayer::BufferLayer : public FrameCaptureProcessor::Layer {

    BufferLayer(const BufferItem &bi) : mBufferItem(bi) {}

    BufferLayer(const BufferItem &bi) : mBufferItem(bi) {}

    void getLayerSettings(

    void getLayerSettings(
@@ -95,7 +87,6 @@ void FrameCaptureLayer::BufferLayer::getLayerSettings( 
    layerSettings->source.buffer.fence = mBufferItem.mFence;

    layerSettings->source.buffer.fence = mBufferItem.mFence;

    layerSettings->source.buffer.textureName = textureName;

    layerSettings->source.buffer.textureName = textureName;

    layerSettings->source.buffer.usePremultipliedAlpha = false;

    layerSettings->source.buffer.usePremultipliedAlpha = false;

    layerSettings->source.buffer.isY410BT2020 = isHdrY410(mBufferItem);

    bool hasSmpte2086 = mBufferItem.mHdrMetadata.validTypes & HdrMetadata::SMPTE2086;

    bool hasSmpte2086 = mBufferItem.mHdrMetadata.validTypes & HdrMetadata::SMPTE2086;

    bool hasCta861_3 = mBufferItem.mHdrMetadata.validTypes & HdrMetadata::CTA861_3;

    bool hasCta861_3 = mBufferItem.mHdrMetadata.validTypes & HdrMetadata::CTA861_3;

    layerSettings->source.buffer.maxMasteringLuminance = hasSmpte2086

    layerSettings->source.buffer.maxMasteringLuminance = hasSmpte2086