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

Commit 0f99f599 authored by Harish Mahendrakar's avatar Harish Mahendrakar
Browse files

Revert "C2 av1, vp9: Disable P010 temporarily" 

This reverts commit 272845c8.

Reason for revert: This hasn't been cherry-picked to internal T branches. Reverting this from aosp/master as well to keep the two
branches in sync and let the tests fail in aosp/master for now.

Bug: 229387180
Test: Builds

Change-Id: Ibced98a8b2c5f9dbeb50314bb9e53b53b1dfd52c
parent 272845c8

media/codec2/components/base/SimpleC2Component.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -774,8 +774,7 @@ int SimpleC2Component::getHalPixelFormatForBitDepth10(bool allowRGBA1010102) { 
    // Save supported hal pixel formats for bit depth of 10, the first time this is called

    // Save supported hal pixel formats for bit depth of 10, the first time this is called

    if (!mBitDepth10HalPixelFormats.size()) {

    if (!mBitDepth10HalPixelFormats.size()) {

        std::vector<int> halPixelFormats;

        std::vector<int> halPixelFormats;

        // TODO(b/229387180) Enable once P010 is fully supported

        if (isAtLeastT()) {

        if (false && isAtLeastT()) {

            halPixelFormats.push_back(HAL_PIXEL_FORMAT_YCBCR_P010);

            halPixelFormats.push_back(HAL_PIXEL_FORMAT_YCBCR_P010);

        }

        }

        // since allowRGBA1010102 can chance in each call, but mBitDepth10HalPixelFormats

        // since allowRGBA1010102 can chance in each call, but mBitDepth10HalPixelFormats

media/codec2/components/gav1/C2SoftGav1Dec.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -190,8 +190,7 @@ class C2SoftGav1Dec::IntfImpl : public SimpleInterface<void>::BaseParams { 
              .build());

              .build());





    std::vector<uint32_t> pixelFormats = {HAL_PIXEL_FORMAT_YCBCR_420_888};

    std::vector<uint32_t> pixelFormats = {HAL_PIXEL_FORMAT_YCBCR_420_888};

    // TODO(b/229387180) Enable once P010 is fully supported

    if (isAtLeastT()) {

    if (false && isAtLeastT()) {

        pixelFormats.push_back(HAL_PIXEL_FORMAT_YCBCR_P010);

        pixelFormats.push_back(HAL_PIXEL_FORMAT_YCBCR_P010);

    }

    }

    // TODO: support more formats?

    // TODO: support more formats?

media/codec2/components/vpx/C2SoftVpxDec.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -219,8 +219,7 @@ public: 
        // TODO: support more formats?

        // TODO: support more formats?

        std::vector<uint32_t> pixelFormats = {HAL_PIXEL_FORMAT_YCBCR_420_888};

        std::vector<uint32_t> pixelFormats = {HAL_PIXEL_FORMAT_YCBCR_420_888};

#ifdef VP9

#ifdef VP9

        // TODO(b/229387180) Enable once P010 is fully supported

        if (isAtLeastT()) {

        if (false && isAtLeastT()) {

            pixelFormats.push_back(HAL_PIXEL_FORMAT_YCBCR_P010);

            pixelFormats.push_back(HAL_PIXEL_FORMAT_YCBCR_P010);

        }

        }

#endif

#endif