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

Commit b629a5d0 authored by Gareth Fenn's avatar Gareth Fenn Committed by Pierre Couillaud
Browse files

TunerHAL fixes 



TunerHAL expects Hz
Fix stopRecordThread race
Push segment000000.ts to device
getFrontendIdByType() should return INVALID_ID when no FE found

Bug: 201556155
Test: VtsHalTvTunerV1_{0,1}TargetTest on BCM device
Change-Id: Idab6817e47f3e10f07a36a8b2fd805336b9f0e5d
Signed-off-by: default avatarPierre Couillaud <pierre@broadcom.com>
parent 520e3c4d

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/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);
@@ -414,7 +414,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,

tv/tuner/1.1/default/Frontend.cpp

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



    if (type == FrontendScanType::SCAN_BLIND) {

        frequency += 100;

        frequency += 100 * 1000;

    }



    msg.frequencies({frequency});