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

Commit fecab6b5 authored by Sushant's avatar Sushant Committed by Srujan Vandrangi (xWF)
Browse files

C2SoftAvcEnc : add keep_threads_active flag for avc encoder 

Bug: 288998933
Test: atest MctsMediaV2TestCases
      atest MctsMediaEncoderTestCases
      atest MctsMediaCodecTestCases
      atest VtsHalMediaC2V1_0TargetVideoEncTest
FLAG: android.media.swcodec.flags.avc_keep_threads_active

Change-Id: Ib3483752b9500af66c9568223d2299482b9ce440
parent d5ed22f0

media/aconfig/swcodec_flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,13 @@ flag { 
  bug: "376770121"

}



flag {

  name: "avc_keep_threads_active"

  namespace: "codec_fwk"

  description: "Enable keep_threads_active in avc encoder"

  bug: "288998933"

}



flag {

  name: "dataspace_v0_gralloc4"

  is_exported: false

media/codec2/components/avc/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ cc_library { 


    static_libs: ["libavcenc"],



    shared_libs: ["android.media.swcodec.flags-aconfig-cc"],



    srcs: ["C2SoftAvcEnc.cpp"],



    export_include_dirs: ["."],

media/codec2/components/avc/C2SoftAvcEnc.cpp

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "C2SoftAvcEnc"

#include <android_media_swcodec_flags.h>

#include <log/log.h>

#include <utils/misc.h>
@@ -679,6 +680,7 @@ void C2SoftAvcEnc::initEncParams() { 
    mReconEnable = DEFAULT_RECON_ENABLE;

    mEntropyMode = DEFAULT_ENTROPY_MODE;

    mBframes = DEFAULT_B_FRAMES;

    mKeepThreadsActive = false;



    mTimeStart = mTimeEnd = systemTime();

}
@@ -1169,6 +1171,7 @@ c2_status_t C2SoftAvcEnc::initEncoder() { 
    CHECK(!mStarted);



    c2_status_t errType = C2_OK;

    mKeepThreadsActive = android::media::swcodec::flags::avc_keep_threads_active();



    std::shared_ptr<C2StreamGopTuning::output> gop;

    {
@@ -1285,6 +1288,7 @@ c2_status_t C2SoftAvcEnc::initEncoder() { 
        ps_fill_mem_rec_ip->u4_max_reorder_cnt = DEFAULT_MAX_REORDER_FRM;

        ps_fill_mem_rec_ip->u4_max_srch_rng_x = DEFAULT_MAX_SRCH_RANGE_X;

        ps_fill_mem_rec_ip->u4_max_srch_rng_y = DEFAULT_MAX_SRCH_RANGE_Y;

        ps_fill_mem_rec_ip->u4_keep_threads_active = mKeepThreadsActive;



        status = ive_api_function(nullptr, &s_ih264e_mem_rec_ip, &s_ih264e_mem_rec_op);
@@ -1371,6 +1375,7 @@ c2_status_t C2SoftAvcEnc::initEncoder() { 
        ps_init_ip->u4_slice_param = mSliceParam;

        ps_init_ip->e_arch = mArch;

        ps_init_ip->e_soc = DEFAULT_SOC;

        ps_init_ip->u4_keep_threads_active = mKeepThreadsActive;



        status = ive_api_function(mCodecCtx, &s_enc_ip, &s_enc_op);

media/codec2/components/avc/C2SoftAvcEnc.h

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ private: 
    bool     mPSNREnable;

    bool     mEntropyMode;

    bool     mConstrainedIntraFlag;

    bool     mKeepThreadsActive;

    IVE_SPEED_CONFIG     mEncSpeed;



    iv_obj_t *mCodecCtx;         // Codec context