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

Commit a526e121 authored by Amy Zhang's avatar Amy Zhang Committed by Automerger Merge Worker
Browse files

Merge "Enable frontend input loop when FrontendTune happens before Demux is... 

Merge "Enable frontend input loop when FrontendTune happens before Demux is configured." into rvc-dev am: 1fb7d067 am: ecc7c04f am: fb101c39

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/11853109

Change-Id: Id119efc323ded033032de668080845ad4da1a3b8
parents 44e27ce1 fb101c39

tv/tuner/1.0/default/Frontend.cpp

+5 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ Return<Result> Frontend::tune(const FrontendSettings& /* settings */) { 


    mTunerService->frontendStartTune(mId);

    mCallback->onEvent(FrontendEventType::LOCKED);

    mIsLocked = false;

    mIsLocked = true;

    return Result::SUCCESS;

}
@@ -272,6 +272,10 @@ bool Frontend::supportsSatellite() { 
    return mType == FrontendType::DVBS || mType == FrontendType::ISDBS ||

           mType == FrontendType::ISDBS3;

}



bool Frontend::isLocked() {

    return mIsLocked;

}

}  // namespace implementation

}  // namespace V1_0

}  // namespace tuner

tv/tuner/1.0/default/Frontend.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ class Frontend : public IFrontend { 


    string getSourceFile();



    bool isLocked();



  private:

    virtual ~Frontend();

    bool supportsSatellite();

tv/tuner/1.0/default/Tuner.cpp

+3 −0
Original line number Diff line number Diff line
@@ -231,6 +231,9 @@ Return<void> Tuner::openLnbByName(const hidl_string& /*lnbName*/, openLnbByName_ 


void Tuner::setFrontendAsDemuxSource(uint32_t frontendId, uint32_t demuxId) {

    mFrontendToDemux[frontendId] = demuxId;

    if (mFrontends[frontendId] != nullptr && mFrontends[frontendId]->isLocked()) {

        mDemuxes[demuxId]->startFrontendInputLoop();

    }

}



void Tuner::frontendStopTune(uint32_t frontendId) {