Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 21:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Tuner HAL 1.1 frontendSettingsExt into frontendSettingsExt1_1

Browse Source 
Test: make
Bug: 158818695
Change-Id: I1d9e89556fc7de0962dcfbf379c115ea4a0e8d32
This commit is contained in:
Amy Zhang
2020-09-25 15:35:55 -07:00
parent b7e266ecd9
commit bc15b5964e
8 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tv/tuner/1.1/IFrontend.hal
View File

@@ -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.

4
tv/tuner/1.1/default/Frontend.cpp
View File

@@ -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);
}

4
tv/tuner/1.1/default/Frontend.h
View File

@@ -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;

14
tv/tuner/1.1/types.hal
View File

@@ -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;
};

10
tv/tuner/1.1/vts/functional/FrontendTests.cpp
View File

@@ -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);
}

2
tv/tuner/1.1/vts/functional/FrontendTests.h
View File

@@ -72,7 +72,7 @@ class FrontendCallback : public IFrontendCallback {
const FrontendScanMessage& message) override;
void tuneTestOnLock(sp<IFrontend>& frontend, FrontendSettings settings,
FrontendSettingsExt settingsExt);
FrontendSettingsExt1_1 settingsExt1_1);
void scanTest(sp<IFrontend>& frontend, FrontendConfig config, FrontendScanType type);
// Helper methods

6
tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TargetTest.cpp
View File

@@ -142,13 +142,13 @@ TEST_P(TunerRecordHidlTest, RecordDataFlowWithTsRecordFilterTest) {
recordSingleFilterTest(filterArray[TS_RECORD0], frontendArray[DVBT], dvrArray[DVR_RECORD0]);
}
TEST_P(TunerFrontendHidlTest, TuneFrontendWithFrontendSettingsExt) {
description("Tune one Frontend with specific setting and check Lock event");
TEST_P(TunerFrontendHidlTest, TuneFrontendWithFrontendSettingsExt1_1) {
description("Tune one Frontend with v1_1 extended setting and check Lock event");
mFrontendTests.tuneTest(frontendArray[DVBT]);
}
TEST_P(TunerFrontendHidlTest, BlindScanFrontendWithEndFrequency) {
description("Run an blind frontend scan with specific setting and check lock scanMessage");
description("Run an blind frontend scan with v1_1 extended setting and check lock scanMessage");
mFrontendTests.scanTest(frontendScanArray[SCAN_DVBT], FrontendScanType::SCAN_BLIND);
}

10
tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TestConfigurations.h
View File

@@ -48,7 +48,7 @@ using android::hardware::tv::tuner::V1_0::FrontendStatusType;
using android::hardware::tv::tuner::V1_0::FrontendType;
using android::hardware::tv::tuner::V1_0::PlaybackSettings;
using android::hardware::tv::tuner::V1_0::RecordSettings;
using android::hardware::tv::tuner::V1_1::FrontendSettingsExt;
using android::hardware::tv::tuner::V1_1::FrontendSettingsExt1_1;
using namespace std;
@@ -100,7 +100,7 @@ struct FrontendConfig {
bool isSoftwareFe;
FrontendType type;
FrontendSettings settings;
FrontendSettingsExt settingsExt;
FrontendSettingsExt1_1 settingsExt1_1;
vector<FrontendStatusType> tuneStatusTypes;
vector<FrontendStatus> expectTuneStatuses;
};
@@ -141,7 +141,7 @@ inline void initFrontendConfig() {
frontendArray[DVBT].tuneStatusTypes = types;
frontendArray[DVBT].expectTuneStatuses = statuses;
frontendArray[DVBT].isSoftwareFe = true;
frontendArray[DVBT].settingsExt.settingExt.dvbt({
frontendArray[DVBT].settingsExt1_1.settingExt.dvbt({
.transmissionMode =
android::hardware::tv::tuner::V1_1::FrontendDvbtTransmissionMode::MODE_8K_E,
});
@@ -164,8 +164,8 @@ inline void initFrontendScanConfig() {
.isHighPriority = true,
.standard = FrontendDvbtStandard::T,
});
frontendScanArray[SCAN_DVBT].settingsExt.endFrequency = 800000;
frontendScanArray[SCAN_DVBT].settingsExt.settingExt.dvbt({
frontendScanArray[SCAN_DVBT].settingsExt1_1.endFrequency = 800000;
frontendScanArray[SCAN_DVBT].settingsExt1_1.settingExt.dvbt({
.transmissionMode =
android::hardware::tv::tuner::V1_1::FrontendDvbtTransmissionMode::MODE_8K_E,
});