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

Commit 7d64724b authored by Fyodor Kyslov's avatar Fyodor Kyslov Committed by Gerrit Code Review
Browse files

Merge "APV: Fix internal reset function name" into main

parents 6ed067cd fc1a1493

media/codec2/components/apv/C2SoftApvEnc.cpp

+3 −3
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ C2SoftApvEnc::C2SoftApvEnc(const char* name, c2_node_id_t id, 
      mSignalledEos(false),

      mSignalledError(false),

      mOutBlock(nullptr) {

    reset();

    resetEncoder();

}



C2SoftApvEnc::~C2SoftApvEnc() {
@@ -798,7 +798,7 @@ c2_status_t C2SoftApvEnc::onStop() { 


void C2SoftApvEnc::onReset() {

    releaseEncoder();

    reset();

    resetEncoder();

}



void C2SoftApvEnc::onRelease() {
@@ -828,7 +828,7 @@ int32_t C2SoftApvEnc::getQpFromQuality(int32_t quality) { 
    return qp;

}



c2_status_t C2SoftApvEnc::reset() {

c2_status_t C2SoftApvEnc::resetEncoder() {

    ALOGV("reset");

    mInitEncoder = false;

    mStarted = false;

media/codec2/components/apv/C2SoftApvEnc.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct C2SoftApvEnc final : public SimpleC2Component { 
    c2_status_t drain(uint32_t drainMode, const std::shared_ptr<C2BlockPool>& pool) override;



  private:

    c2_status_t reset();

    c2_status_t resetEncoder();

    c2_status_t initEncoder();

    c2_status_t releaseEncoder();

    c2_status_t setEncodeArgs(oapv_frms_t* imgb_inp, const C2GraphicView* const input,