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

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

Merge "Revert "C2 av1, vp9: Disable P010 temporarily"" am: e93b45f5 

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



Change-Id: I136c51b9702b8f92f80e3a093bceb8aca4db6682
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 51ea096b e93b45f5

media/codec2/components/base/SimpleC2Component.cpp

+1 −2
Original line number 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

    if (!mBitDepth10HalPixelFormats.size()) {

        std::vector<int> halPixelFormats;

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

        if (false && isAtLeastT()) {

        if (isAtLeastT()) {

            halPixelFormats.push_back(HAL_PIXEL_FORMAT_YCBCR_P010);

        }

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

media/codec2/components/gav1/C2SoftGav1Dec.cpp

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



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

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

    if (false && isAtLeastT()) {

    if (isAtLeastT()) {

        pixelFormats.push_back(HAL_PIXEL_FORMAT_YCBCR_P010);

    }

    // TODO: support more formats?

media/codec2/components/vpx/C2SoftVpxDec.cpp

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

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

#ifdef VP9

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

        if (false && isAtLeastT()) {

        if (isAtLeastT()) {

            pixelFormats.push_back(HAL_PIXEL_FORMAT_YCBCR_P010);

        }

#endif