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

Commit 448000bc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "CCodec: fix dataspace configured for the input surfaces"" into... 

Merge "Revert "CCodec: fix dataspace configured for the input surfaces"" into sc-dev am: dd7f1f7b am: 6ca6946b

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

Change-Id: Ife165f9d8b2f98fed38c9fb7e8d66310af125d00
parents 28b0bbb8 6ca6946b

media/codec2/sfplugin/CCodec.cpp

+2 −19
Original line number Original line Diff line number Diff line
@@ -1572,25 +1572,8 @@ status_t CCodec::setupInputSurface(const std::shared_ptr<InputSurfaceWrapper> &s 




    // configure dataspace

    // configure dataspace

    static_assert(sizeof(int32_t) == sizeof(android_dataspace), "dataspace size mismatch");

    static_assert(sizeof(int32_t) == sizeof(android_dataspace), "dataspace size mismatch");



    android_dataspace dataSpace = HAL_DATASPACE_UNKNOWN;

    // The output format contains app-configured color aspects, and the input format

    (void)config->mInputFormat->findInt32("android._dataspace", (int32_t*)&dataSpace);

    // has the default color aspects. Use the default for the unspecified params.

    ColorAspects inputColorAspects, outputColorAspects;

    getColorAspectsFromFormat(config->mOutputFormat, outputColorAspects);

    getColorAspectsFromFormat(config->mInputFormat, inputColorAspects);

    if (outputColorAspects.mRange == ColorAspects::RangeUnspecified) {

        outputColorAspects.mRange = inputColorAspects.mRange;

    }

    if (outputColorAspects.mPrimaries == ColorAspects::PrimariesUnspecified) {

        outputColorAspects.mPrimaries = inputColorAspects.mPrimaries;

    }

    if (outputColorAspects.mTransfer == ColorAspects::TransferUnspecified) {

        outputColorAspects.mTransfer = inputColorAspects.mTransfer;

    }

    if (outputColorAspects.mMatrixCoeffs == ColorAspects::MatrixUnspecified) {

        outputColorAspects.mMatrixCoeffs = inputColorAspects.mMatrixCoeffs;

    }

    android_dataspace dataSpace = getDataSpaceForColorAspects(outputColorAspects, false);

    surface->setDataSpace(dataSpace);

    surface->setDataSpace(dataSpace);





    status_t err = mChannel->setInputSurface(surface);

    status_t err = mChannel->setInputSurface(surface);