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

Commit f125dacb authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Gerrit Code Review
Browse files

Merge "SoftAvcEnc: Added support for Constrained intra prediction."

parents 2dab1fe4 e239dc16

media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp

+2 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ void SoftAVC::initEncParams() { 
    mEnableAltRef = DEFAULT_ENABLE_ALT_REF;

    mEncSpeed = DEFAULT_ENC_SPEED;

    mIntra4x4 = DEFAULT_INTRA4x4;

    mConstrainedIntraFlag = DEFAULT_CONSTRAINED_INTRA;

    mAIRMode = DEFAULT_AIR;

    mAIRRefreshPeriod = DEFAULT_AIR_REFRESH_PERIOD;

    mPSNREnable = DEFAULT_PSNR_ENABLE;
@@ -303,6 +304,7 @@ OMX_ERRORTYPE SoftAVC::setIpeParams() { 


    s_ipe_params_ip.u4_enable_intra_4x4 = mIntra4x4;

    s_ipe_params_ip.u4_enc_speed_preset = mEncSpeed;

    s_ipe_params_ip.u4_constrained_intra_pred = mConstrainedIntraFlag;



    s_ipe_params_ip.u4_timestamp_high = -1;

    s_ipe_params_ip.u4_timestamp_low = -1;

media/libstagefright/codecs/avcenc/SoftAVCEnc.h

+2 −2
Original line number Diff line number Diff line
@@ -95,8 +95,7 @@ namespace android { 
#define DEFAULT_SOC                 SOC_GENERIC

#define DEFAULT_INTRA4x4            0

#define STRLENGTH                   500





#define DEFAULT_CONSTRAINED_INTRA   0



#define MIN(a, b) ((a) < (b))? (a) : (b)

#define MAX(a, b) ((a) > (b))? (a) : (b)
@@ -181,6 +180,7 @@ private: 
    bool     mReconEnable;

    bool     mPSNREnable;

    bool     mEntropyMode;

    bool     mConstrainedIntraFlag;

    IVE_SPEED_CONFIG     mEncSpeed;



    uint8_t *mConversionBuffers[MAX_CONVERSION_BUFFERS];