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

Commit bc15b596 authored by Amy Zhang's avatar Amy Zhang
Browse files

Rename Tuner HAL 1.1 frontendSettingsExt into frontendSettingsExt1_1 

Test: make
Bug: 158818695
Change-Id: I1d9e89556fc7de0962dcfbf379c115ea4a0e8d32
parent b7e266ec

tv/tuner/1.1/IFrontend.hal

+5 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ interface IFrontend extends @1.0::IFrontend { 
     *

     * @param settings Signal delivery information the frontend uses to

     * search and lock the signal.

     * @param settingsExt Extended information that would be used in the 1.1 Frontend to

     * @param settingsExt1_1 v1_1 Extended information that would be used in the 1.1 Frontend to

     * search and lock the signal in a better way.

     *

     * @return result Result status of the operation.
@@ -45,7 +45,7 @@ interface IFrontend extends @1.0::IFrontend { 
     *         INVALID_STATE if tuning can't be applied at current stage,

     *         UNKNOWN_ERROR if tuning failed for other reasons.

     */

    tune_1_1(FrontendSettings settings, FrontendSettingsExt settingsExt)

    tune_1_1(FrontendSettings settings, FrontendSettingsExt1_1 settingsExt1_1)

        generates (Result result);



    /**
@@ -59,15 +59,15 @@ interface IFrontend extends @1.0::IFrontend { 
     * @param settings Signal delivery information which the frontend uses to

     * scan the signal.

     * @param type the type which the frontend uses to scan the signal.

     * @param settingsExt Extended information that would be used in the 1.1 Frontend to

     * @param settingsExt1_1 v1_1 Extended information that would be used in the 1.1 Frontend to

     * search and lock the signal in a better way.

     * @return result Result status of the operation.

     *         SUCCESS if successful,

     *         INVALID_STATE if tuning can't be applied at current stage,

     *         UNKNOWN_ERROR if tuning failed for other reasons.

     */

    scan_1_1(FrontendSettings settings, FrontendScanType type, FrontendSettingsExt settingsExt)

        generates (Result result);

    scan_1_1(FrontendSettings settings, FrontendScanType type,

        FrontendSettingsExt1_1 settingsExt1_1) generates (Result result);



    /**

     * Link Conditional Access Modules (CAM) to Frontend support Common Interface (CI) bypass mode.

tv/tuner/1.1/default/Frontend.cpp

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



Return<Result> Frontend::tune_1_1(const FrontendSettings& settings,

                                  const V1_1::FrontendSettingsExt& /*settingsExt*/) {

                                  const V1_1::FrontendSettingsExt1_1& /*settingsExt1_1*/) {

    ALOGV("%s", __FUNCTION__);

    return tune(settings);

}
@@ -122,7 +122,7 @@ Return<Result> Frontend::scan(const FrontendSettings& settings, FrontendScanType 
}



Return<Result> Frontend::scan_1_1(const FrontendSettings& settings, FrontendScanType type,

                                  const V1_1::FrontendSettingsExt& /*settingsExt*/) {

                                  const V1_1::FrontendSettingsExt1_1& /*settingsExt1_1*/) {

    ALOGV("%s", __FUNCTION__);

    return scan(settings, type);

}

tv/tuner/1.1/default/Frontend.h

+2 −2
Original line number Diff line number Diff line
@@ -44,14 +44,14 @@ class Frontend : public V1_1::IFrontend { 
    virtual Return<Result> tune(const FrontendSettings& settings) override;



    virtual Return<Result> tune_1_1(const FrontendSettings& settings,

                                    const V1_1::FrontendSettingsExt& settingsExt) override;

                                    const V1_1::FrontendSettingsExt1_1& settingsExt1_1) override;



    virtual Return<Result> stopTune() override;



    virtual Return<Result> scan(const FrontendSettings& settings, FrontendScanType type) override;



    virtual Return<Result> scan_1_1(const FrontendSettings& settings, FrontendScanType type,

                                    const V1_1::FrontendSettingsExt& settingsExt) override;

                                    const V1_1::FrontendSettingsExt1_1& settingsExt1_1) override;



    virtual Return<Result> stopScan() override;

tv/tuner/1.1/types.hal

+7 −7
Original line number Diff line number Diff line
@@ -145,14 +145,14 @@ enum FrontendDvbtConstellation : @1.0::FrontendDvbtConstellation { 
/**

 *  Extended Signal Settings for a DVBS Frontend.

 */

struct FrontendDvbsSettingsExt {

struct FrontendDvbsSettingsExt1_1 {

    FrontendDvbsScanType scanType;

};



/**

 *  Extended Signal Settings for a DVBT Frontend.

 */

struct FrontendDvbtSettingsExt {

struct FrontendDvbtSettingsExt1_1 {

    FrontendDvbtConstellation constellation;



    FrontendDvbtTransmissionMode transmissionMode;
@@ -161,14 +161,14 @@ struct FrontendDvbtSettingsExt { 
/**

 *  Extended Signal Settings for an Analog Frontend.

 */

struct FrontendAnalogSettingsExt {

struct FrontendAnalogSettingsExt1_1 {

    FrontendAnalogAftFlag aftFlag;

};



/**

 *  Extended Signal Settings for Frontend.

 */

struct FrontendSettingsExt {

struct FrontendSettingsExt1_1 {

    uint32_t endFrequency;



    FrontendSpectralInversion inversion;
@@ -176,10 +176,10 @@ struct FrontendSettingsExt { 
    safe_union SettingsExt {

        Monostate noinit;



        FrontendAnalogSettingsExt analog;

        FrontendAnalogSettingsExt1_1 analog;



        FrontendDvbsSettingsExt dvbs;

        FrontendDvbsSettingsExt1_1 dvbs;



        FrontendDvbtSettingsExt dvbt;

        FrontendDvbtSettingsExt1_1 dvbt;

    } settingExt;

};

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

+5 −5
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ Return<void> FrontendCallback::onScanMessage(FrontendScanMessageType type, 
}



void FrontendCallback::tuneTestOnLock(sp<IFrontend>& frontend, FrontendSettings settings,

                                      FrontendSettingsExt settingsExt) {

                                      FrontendSettingsExt1_1 settingsExt1_1) {

    sp<android::hardware::tv::tuner::V1_1::IFrontend> frontend_1_1;

    frontend_1_1 = android::hardware::tv::tuner::V1_1::IFrontend::castFrom(frontend);

    if (frontend_1_1 == nullptr) {
@@ -56,7 +56,7 @@ void FrontendCallback::tuneTestOnLock(sp<IFrontend>& frontend, FrontendSettings 
        return;

    }



    Result result = frontend_1_1->tune_1_1(settings, settingsExt);

    Result result = frontend_1_1->tune_1_1(settings, settingsExt1_1);

    EXPECT_TRUE(result == Result::SUCCESS);



    android::Mutex::Autolock autoLock(mMsgLock);
@@ -88,7 +88,7 @@ void FrontendCallback::scanTest(sp<IFrontend>& frontend, FrontendConfig config, 
        resetBlindScanStartingFrequency(config, targetFrequency - 100);

    }



    Result result = frontend_1_1->scan_1_1(config.settings, type, config.settingsExt);

    Result result = frontend_1_1->scan_1_1(config.settings, type, config.settingsExt1_1);

    EXPECT_TRUE(result == Result::SUCCESS);



    bool scanMsgLockedReceived = false;
@@ -108,7 +108,7 @@ wait: 
    if (mScanMessageType != FrontendScanMessageType::END) {

        if (mScanMessageType == FrontendScanMessageType::LOCKED) {

            scanMsgLockedReceived = true;

            Result result = frontend_1_1->scan_1_1(config.settings, type, config.settingsExt);

            Result result = frontend_1_1->scan_1_1(config.settings, type, config.settingsExt1_1);

            EXPECT_TRUE(result == Result::SUCCESS);

        }
@@ -380,7 +380,7 @@ AssertionResult FrontendTests::tuneFrontend(FrontendConfig config, bool testWith 
            return failure();

        }

    }

    mFrontendCallback->tuneTestOnLock(mFrontend, config.settings, config.settingsExt);

    mFrontendCallback->tuneTestOnLock(mFrontend, config.settings, config.settingsExt1_1);

    return AssertionResult(true);

}