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

Commit 5e320169 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "s_tuner_partner_fixes_porting" 

* changes:
  Fix TunerHAL deadlock issue
  TunerHAL fixes
parents 9a4a898f 53ae3838

tv/tuner/1.0/default/Frontend.cpp

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ Return<Result> Frontend::scan(const FrontendSettings& settings, FrontendScanType 


    uint32_t frequency = settings.dvbt().frequency;

    if (type == FrontendScanType::SCAN_BLIND) {

        frequency += 100;

        frequency += 100 * 1000;

    }

    msg.frequencies({frequency});

    mCallback->onScanMessage(FrontendScanMessageType::FREQUENCY, msg);

tv/tuner/1.0/default/Tuner.cpp

+2 −2
Original line number Diff line number Diff line
@@ -175,8 +175,8 @@ Return<void> Tuner::getFrontendInfo(FrontendId frontendId, getFrontendInfo_cb _h 
    // assign randomly selected values for testing.

    info = {

            .type = mFrontends[frontendId]->getFrontendType(),

            .minFrequency = 139,

            .maxFrequency = 1139,

            .minFrequency = 139000000,

            .maxFrequency = 1139000000,

            .minSymbolRate = 45,

            .maxSymbolRate = 1145,

            .acquireRange = 30,

tv/tuner/1.0/vts/functional/DvrTests.cpp

+3 −4
Original line number Diff line number Diff line
@@ -124,11 +124,9 @@ void DvrCallback::testRecordOutput() { 
    while (mDataOutputBuffer.empty()) {

        if (-ETIMEDOUT == mMsgCondition.waitRelative(mMsgLock, WAIT_TIMEOUT)) {

            EXPECT_TRUE(false) << "record output matching pid does not output within timeout";

            stopRecordThread();

            return;

        }

    }

    stopRecordThread();

    ALOGW("[vts] record pass and stop");

}
@@ -193,9 +191,10 @@ void DvrCallback::recordThreadLoop(RecordSettings* /*recordSettings*/, bool* kee 
bool DvrCallback::readRecordFMQ() {

    android::Mutex::Autolock autoLock(mMsgLock);

    bool result = false;

    int readSize = mRecordMQ->availableToRead();

    mDataOutputBuffer.clear();

    mDataOutputBuffer.resize(mRecordMQ->availableToRead());

    result = mRecordMQ->read(mDataOutputBuffer.data(), mRecordMQ->availableToRead());

    mDataOutputBuffer.resize(readSize);

    result = mRecordMQ->read(mDataOutputBuffer.data(), readSize);

    EXPECT_TRUE(result) << "can't read from Record MQ";

    mMsgCondition.signal();

    return result;

tv/tuner/1.0/vts/functional/FrontendTests.cpp

+1 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void FrontendCallback::scanTest(sp<IFrontend>& frontend, FrontendConfig config, 
        // passed in means the real input config on the transponder connected to the DUT.

        // We want the blind the test to start from lower frequency than this to check the blind

        // scan implementation.

        resetBlindScanStartingFrequency(config, targetFrequency - 100);

        resetBlindScanStartingFrequency(config, targetFrequency - 100 * 1000);

    }



    Result result = frontend->scan(config.settings, type);
@@ -415,7 +415,6 @@ AssertionResult FrontendTests::closeFrontend() { 


void FrontendTests::getFrontendIdByType(FrontendType feType, uint32_t& feId) {

    ASSERT_TRUE(getFrontendIds());

    ASSERT_TRUE(mFeIds.size() > 0);

    for (size_t i = 0; i < mFeIds.size(); i++) {

        ASSERT_TRUE(getFrontendInfo(mFeIds[i]));

        if (mFrontendInfo.type != feType) {

tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ inline void initFrontendConfig() { 
    // without overriding in the xml config.

    string defaultFeId = "FE_DEFAULT";

    FrontendDvbtSettings dvbtSettings{

            .frequency = 578000,

            .frequency = 578000000,

            .transmissionMode = FrontendDvbtTransmissionMode::AUTO,

            .bandwidth = FrontendDvbtBandwidth::BANDWIDTH_8MHZ,

            .isHighPriority = true,