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

Commit e69a3b29 authored by Hongguang's avatar Hongguang
Browse files

Update tuner AIDL default implementation. 

*) Fix ISDBT Frontend in the default implementation.
*) Merge ag/15455889.

Bug: 191825295
Test: atest VtsHalTvTunerTargetTest
Change-Id: I70029cfc856aadcdfda0d3c3a1eb1a80f9674e25
parent 5fc72a63

tv/tuner/aidl/default/Filter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ uint16_t Filter::getTpid() { 
    return mTpid;

}



void Filter::updateFilterOutput(vector<int8_t> data) {

void Filter::updateFilterOutput(vector<int8_t>& data) {

    std::lock_guard<std::mutex> lock(mFilterOutputLock);

    mFilterOutput.insert(mFilterOutput.end(), data.begin(), data.end());

}
@@ -529,7 +529,7 @@ void Filter::updatePts(uint64_t pts) { 
    mPts = pts;

}



void Filter::updateRecordOutput(vector<int8_t> data) {

void Filter::updateRecordOutput(vector<int8_t>& data) {

    std::lock_guard<std::mutex> lock(mRecordFilterOutputLock);

    mRecordFilterOutput.insert(mRecordFilterOutput.end(), data.begin(), data.end());

}

tv/tuner/aidl/default/Filter.h

+2 −2
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ class Filter : public BnFilter { 
     */

    bool createFilterMQ();

    uint16_t getTpid();

    void updateFilterOutput(vector<int8_t> data);

    void updateRecordOutput(vector<int8_t> data);

    void updateFilterOutput(vector<int8_t>& data);

    void updateRecordOutput(vector<int8_t>& data);

    void updatePts(uint64_t pts);

    ::ndk::ScopedAStatus startFilterHandler();

    ::ndk::ScopedAStatus startRecordFilterHandler();

tv/tuner/aidl/default/Frontend.cpp

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ Frontend::~Frontend() {} 
                    }

                    case FrontendType::ISDBT: {

                        interval.set<FrontendGuardInterval::Tag::isdbt>(

                                FrontendDvbtGuardInterval::INTERVAL_1_32);  // value = 1 << 1

                                FrontendIsdbtGuardInterval::INTERVAL_1_32);  // value = 1 << 1

                        status.set<FrontendStatus::interval>(interval);

                        break;

                    }

tv/tuner/aidl/default/Tuner.cpp

+3 −4
Original line number Diff line number Diff line
@@ -114,10 +114,9 @@ Tuner::Tuner() { 
            .modeCap = (int)FrontendIsdbtMode::MODE_1 | (int)FrontendIsdbtMode::MODE_2,

            .bandwidthCap = (int)FrontendIsdbtBandwidth::BANDWIDTH_6MHZ,

            .modulationCap = (int)FrontendIsdbtModulation::MOD_16QAM,

            // ISDBT shares coderate and guard interval with DVBT

            .coderateCap = (int)FrontendDvbtCoderate::CODERATE_4_5 |

                           (int)FrontendDvbtCoderate::CODERATE_6_7,

            .guardIntervalCap = (int)FrontendDvbtGuardInterval::INTERVAL_1_128,

            .coderateCap = (int)FrontendIsdbtCoderate::CODERATE_4_5 |

                           (int)FrontendIsdbtCoderate::CODERATE_6_7,

            .guardIntervalCap = (int)FrontendIsdbtGuardInterval::INTERVAL_1_128,

    };

    capsIsdbt.set<FrontendCapabilities::Tag::isdbtCaps>(isdbtCaps);

    mFrontendCaps[5] = capsIsdbt;