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

Commit 4701442e authored by Fyodor Kyslov's avatar Fyodor Kyslov Committed by Automerger Merge Worker
Browse files

Merge "APV: Pass Color aspect params to core encoder correctly" into main am:... 

Merge "APV: Pass Color aspect params to core encoder correctly" into main am: 1c148b8a am: 42713f16

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



Change-Id: I9953db85e8c6c2da65c529d7b31e61dd4e8d9ba9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 66ad5d67 42713f16

media/codec2/components/apv/C2SoftApvEnc.cpp

+12 −0
Original line number Diff line number Diff line
@@ -944,6 +944,18 @@ void C2SoftApvEnc::setParams(oapve_param_t& param) { 
    param.band_idc = mIntf->getBandIdc_l();

    param.profile_idc = mIntf->getProfile_l();

    param.level_idc = mIntf->getLevel_l();

    mColorAspects = mIntf->getColorAspects_l();

    param.color_primaries = mColorAspects->primaries;

    param.transfer_characteristics = mColorAspects->transfer;

    param.matrix_coefficients = mColorAspects->matrix;

    param.full_range_flag = mColorAspects->range;



    if (param.color_primaries != C2Color::PRIMARIES_UNSPECIFIED ||

            param.transfer_characteristics != C2Color::TRANSFER_UNSPECIFIED ||

            param.matrix_coefficients != C2Color::MATRIX_UNSPECIFIED ||

            param.full_range_flag != C2Color::RANGE_UNSPECIFIED) {

        param.color_description_present_flag = 1;

    }

}



c2_status_t C2SoftApvEnc::setEncodeArgs(oapv_frms_t* inputFrames, const C2GraphicView* const input,