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

Merge changes I8cbbf1e3,I4ed8ec1f

Browse Source 
* changes:
  Add FrontendStatusExt1_1 and getStatusExt1_1 to get 1.1 Extended Frontend Status
  Add DTMB Frontend Type and Related Capabilities enums
This commit is contained in:
Amy Zhang
2020-09-30 20:01:15 +00:00
committed by Android (Google) Code Review
parent df227a3b11 422bb11cca
commit 549a39c120
11 changed files with 553 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,4 +82,20 @@ interface IFrontend extends @1.0::IFrontend {
* UNKNOWN_ERROR if failed for other reasons.
*/
linkCiCam(uint32_t ciCamId) generates (Result result);
/**
* Get the v1_1 extended statuses of the frontend.
*
* This retrieve the extended statuses of the frontend for given extended status types.
*
* @param statusTypes an array of the extended status types which the caller request.
*
* @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.
* @return statuses an array of extended statuses the caller requests for.
*/
getStatusExt1_1(vec<FrontendStatusTypeExt1_1> statusTypes)
generates (Result result, vec<FrontendStatusExt1_1> statuses);
};

9
tv/tuner/1.1/ITuner.hal
View File

@@ -16,6 +16,7 @@
package android.hardware.tv.tuner@1.1;
import @1.0::FrontendId;
import @1.0::ITuner;
import @1.0::Result;
@@ -23,4 +24,10 @@ import @1.0::Result;
* Top level interface to manage Frontend, Demux and Decrambler hardware
* resources which are needed for Android TV.
*/
interface ITuner extends @1.0::ITuner {};
interface ITuner extends @1.0::ITuner {
/**
* Get Dtmb Frontend Capabilities. If no dtmb exists, Result::UNAVAILABLE would be returned.
*/
getFrontendDtmbCapabilities(FrontendId frontendId)
generates (Result result, FrontendDtmbCapabilities caps);
};

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

@@ -259,6 +259,83 @@ Return<void> Frontend::getStatus(const hidl_vec<FrontendStatusType>& statusTypes
return Void();
}
Return<void> Frontend::getStatusExt1_1(const hidl_vec<V1_1::FrontendStatusTypeExt1_1>& statusTypes,
V1_1::IFrontend::getStatusExt1_1_cb _hidl_cb) {
ALOGV("%s", __FUNCTION__);
vector<V1_1::FrontendStatusExt1_1> statuses;
for (int i = 0; i < statusTypes.size(); i++) {
V1_1::FrontendStatusTypeExt1_1 type = statusTypes[i];
V1_1::FrontendStatusExt1_1 status;
// assign randomly selected values for testing.
switch (type) {
case V1_1::FrontendStatusTypeExt1_1::MODULATIONS: {
vector<V1_1::FrontendModulation> modulations;
V1_1::FrontendModulation modulation;
modulation.isdbt(FrontendIsdbtModulation::MOD_16QAM); // value = 1 << 3
modulations.push_back(modulation);
status.modulations(modulations);
break;
}
case V1_1::FrontendStatusTypeExt1_1::BERS: {
vector<uint32_t> bers = {1};
status.bers(bers);
break;
}
case V1_1::FrontendStatusTypeExt1_1::CODERATES: {
// value = 1 << 39
vector<V1_1::FrontendInnerFec> codeRates = {V1_1::FrontendInnerFec::FEC_6_15};
status.codeRates(codeRates);
break;
}
case V1_1::FrontendStatusTypeExt1_1::GUARD_INTERVAL: {
V1_1::FrontendGuardInterval interval;
interval.dvbt(FrontendDvbtGuardInterval::INTERVAL_1_32); // value = 1 << 1
status.interval(interval);
break;
}
case V1_1::FrontendStatusTypeExt1_1::TRANSMISSION_MODE: {
V1_1::FrontendTransmissionMode transMode;
transMode.dvbt(V1_1::FrontendDvbtTransmissionMode::AUTO); // value = 1 << 0
status.transmissionMode(transMode);
break;
}
case V1_1::FrontendStatusTypeExt1_1::UEC: {
status.uec(4);
break;
}
case V1_1::FrontendStatusTypeExt1_1::T2_SYSTEM_ID: {
status.systemId(5);
break;
}
case V1_1::FrontendStatusTypeExt1_1::INTERLEAVINGS: {
V1_1::FrontendInterleaveMode interleave;
interleave.atsc3(FrontendAtsc3TimeInterleaveMode::AUTO);
vector<V1_1::FrontendInterleaveMode> interleaving = {interleave};
status.interleaving(interleaving);
break;
}
case V1_1::FrontendStatusTypeExt1_1::ISDBT_SEGMENTS: {
vector<uint8_t> segments = {2, 3};
status.isdbtSegment(segments);
break;
}
case V1_1::FrontendStatusTypeExt1_1::TS_DATA_RATES: {
vector<uint32_t> dataRates = {4, 5};
status.tsDataRate(dataRates);
break;
}
default: {
continue;
}
}
statuses.push_back(status);
}
_hidl_cb(Result::SUCCESS, statuses);
return Void();
}
Return<Result> Frontend::setLna(bool /* bEnable */) {
ALOGV("%s", __FUNCTION__);

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

@@ -58,6 +58,10 @@ class Frontend : public V1_1::IFrontend {
virtual Return<void> getStatus(const hidl_vec<FrontendStatusType>& statusTypes,
getStatus_cb _hidl_cb) override;
virtual Return<void> getStatusExt1_1(
const hidl_vec<V1_1::FrontendStatusTypeExt1_1>& statusTypes,
V1_1::IFrontend::getStatusExt1_1_cb _hidl_cb) override;
virtual Return<Result> setLna(bool bEnable) override;
virtual Return<Result> setLnb(uint32_t lnb) override;

18
tv/tuner/1.1/default/Tuner.cpp
View File

@@ -33,7 +33,7 @@ namespace implementation {
Tuner::Tuner() {
// Static Frontends array to maintain local frontends information
// Array index matches their FrontendId in the default impl
mFrontendSize = 8;
mFrontendSize = 9;
mFrontends[0] = new Frontend(FrontendType::DVBT, 0, this);
mFrontends[1] = new Frontend(FrontendType::ATSC, 1, this);
mFrontends[2] = new Frontend(FrontendType::DVBC, 2, this);
@@ -42,6 +42,8 @@ Tuner::Tuner() {
mFrontends[5] = new Frontend(FrontendType::ISDBT, 5, this);
mFrontends[6] = new Frontend(FrontendType::ANALOG, 6, this);
mFrontends[7] = new Frontend(FrontendType::ATSC, 7, this);
mFrontends[8] =
new Frontend(static_cast<V1_0::FrontendType>(V1_1::FrontendType::DTMB), 8, this);
FrontendInfo::FrontendCapabilities caps;
caps = FrontendInfo::FrontendCapabilities();
@@ -224,6 +226,20 @@ Return<void> Tuner::openLnbByName(const hidl_string& /*lnbName*/, openLnbByName_
return Void();
}
Return<void> Tuner::getFrontendDtmbCapabilities(uint32_t frontendId,
getFrontendDtmbCapabilities_cb _hidl_cb) {
ALOGV("%s", __FUNCTION__);
if (mFrontends[frontendId] != nullptr &&
(mFrontends[frontendId]->getFrontendType() ==
static_cast<V1_0::FrontendType>(V1_1::FrontendType::DTMB))) {
_hidl_cb(Result::SUCCESS, mDtmbCaps);
} else {
_hidl_cb(Result::UNAVAILABLE, mDtmbCaps);
}
return Void();
}
void Tuner::setFrontendAsDemuxSource(uint32_t frontendId, uint32_t demuxId) {
mFrontendToDemux[frontendId] = demuxId;
if (mFrontends[frontendId] != nullptr && mFrontends[frontendId]->isLocked()) {

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

@@ -62,6 +62,9 @@ class Tuner : public ITuner {
virtual Return<void> openLnbByName(const hidl_string& lnbName,
openLnbByName_cb _hidl_cb) override;
virtual Return<void> getFrontendDtmbCapabilities(
uint32_t frontendId, getFrontendDtmbCapabilities_cb _hidl_cb) override;
sp<Frontend> getFrontendById(uint32_t frontendId);
void setFrontendAsDemuxSource(uint32_t frontendId, uint32_t demuxId);
@@ -76,6 +79,7 @@ class Tuner : public ITuner {
// Static mFrontends array to maintain local frontends information
map<uint32_t, sp<Frontend>> mFrontends;
map<uint32_t, FrontendInfo::FrontendCapabilities> mFrontendCaps;
V1_1::FrontendDtmbCapabilities mDtmbCaps;
map<uint32_t, uint32_t> mFrontendToDemux;
map<uint32_t, sp<Demux>> mDemuxes;
// To maintain how many Frontends we have

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

@@ -19,9 +19,26 @@ package android.hardware.tv.tuner@1.1;
import @1.0::Constant;
import @1.0::DemuxFilterMmtpRecordEvent;
import @1.0::DemuxFilterTsRecordEvent;
import @1.0::FrontendAtsc3Bandwidth;
import @1.0::FrontendAtsc3Modulation;
import @1.0::FrontendAtsc3TimeInterleaveMode;
import @1.0::FrontendAtscModulation;
import @1.0::FrontendDvbcModulation;
import @1.0::FrontendDvbtBandwidth;
import @1.0::FrontendDvbcSpectralInversion;
import @1.0::FrontendDvbsModulation;
import @1.0::FrontendDvbtConstellation;
import @1.0::FrontendDvbtTransmissionMode;
import @1.0::FrontendDvbtGuardInterval;
import @1.0::FrontendInnerFec;
import @1.0::FrontendIsdbs3Modulation;
import @1.0::FrontendIsdbsModulation;
import @1.0::FrontendIsdbtBandwidth;
import @1.0::FrontendIsdbtGuardInterval;
import @1.0::FrontendIsdbtMode;
import @1.0::FrontendIsdbtModulation;
import @1.0::FrontendStatusType;
import @1.0::FrontendType;
import android.hidl.safe_union@1.0;
import android.hidl.safe_union@1.0::Monostate;
@@ -64,8 +81,7 @@ enum Constant64Bit : uint64_t {
struct DemuxFilterRecordEventExt {
/**
* The Presentation Time Stamp(PTS) for the audio or video frame. It is based on 90KHz
* and has the same format as the PTS in ISO/IEC 13818-1. It is used only for the SC and
* the SC_HEVC.
* and has the same format as the PTS in ISO/IEC 13818-1.
*/
uint64_t pts;
@@ -147,6 +163,8 @@ enum FrontendDvbtConstellation : @1.0::FrontendDvbtConstellation {
*/
struct FrontendDvbsSettingsExt1_1 {
FrontendDvbsScanType scanType;
bool isDiseqcRxMessage;
};
/**
@@ -181,5 +199,326 @@ struct FrontendSettingsExt1_1 {
FrontendDvbsSettingsExt1_1 dvbs;
FrontendDvbtSettingsExt1_1 dvbt;
FrontendDtmbSettings dtmb;
} settingExt;
};
/**
* Extended Frontend Type.
*/
@export
enum FrontendType : @1.0::FrontendType {
/**
* DTMB (Digital Terrestrial Multimedia Broadcast) standard.
*/
DTMB,
};
/**
* Bandwidth Type for DTMB.
*/
@export
enum FrontendDtmbBandwidth : uint32_t {
UNDEFINED = 0,
/**
* hardware is able to detect and set Bandwidth automatically
*/
AUTO = 1 << 0,
BANDWIDTH_8MHZ = 1 << 1,
BANDWIDTH_6MHZ = 1 << 2,
};
/**
* TimeInterleaveMode Type for DTMB.
*/
@export
enum FrontendDtmbTimeInterleaveMode : uint32_t {
UNDEFINED = 0,
/**
* hardware is able to detect and set time interleave mode automatically
*/
AUTO = 1 << 0,
TIMER_INT_240 = 1 << 1,
TIMER_INT_720 = 1 << 2,
};
/**
* FrontendDtmbModulation Type for DTMB.
*/
@export
enum FrontendDtmbModulation : uint32_t {
UNDEFINED = 0,
/**
* hardware is able to detect and set Constellation automatically
*/
AUTO = 1 << 0,
CONSTELLATION_4QAM = 1 << 1,
CONSTELLATION_4QAM_NR = 1 << 2,
CONSTELLATION_16QAM = 1 << 3,
CONSTELLATION_32QAM = 1 << 4,
CONSTELLATION_64QAM = 1 << 5,
};
/**
* CODERATE Type for DTMB.
*/
@export
enum FrontendDtmbCodeRate : uint32_t {
UNDEFINED = 0,
/**
* hardware is able to detect and set code rate automatically
*/
AUTO = 1 << 0,
CODERATE_2_5 = 1 << 1,
CODERATE_3_5 = 1 << 2,
CODERATE_4_5 = 1 << 3,
};
/**
* Guard Interval Type for DTMB.
*/
@export
enum FrontendDtmbGuardInterval : uint32_t {
UNDEFINED = 0,
/**
* hardware is able to detect and set Guard Interval automatically
*/
AUTO = 1 << 0,
PN_420_VARIOUS = 1 << 1,
PN_595_CONST = 1 << 2,
PN_945_VARIOUS = 1 << 3,
PN_420_CONST = 1 << 4,
PN_945_CONST = 1 << 5,
PN_RESERVED = 1 << 6,
};
/**
* Transmission Mode for DTMB.
*/
@export
enum FrontendDtmbTransmissionMode : uint32_t {
UNDEFINED = 0,
/**
* hardware is able to detect and set Transmission Mode automatically
*/
AUTO = 1 << 0,
C1 = 1 << 1,
C3780 = 1 << 2,
};
/**
* Signal Setting for DTMB Frontend.
*/
struct FrontendDtmbSettings {
uint32_t frequency;
FrontendDtmbTransmissionMode transmissionMode;
FrontendDtmbBandwidth bandwidth;
FrontendDtmbModulation modulation;
FrontendDtmbCodeRate codeRate;
FrontendDtmbGuardInterval guardInterval;
FrontendDtmbTimeInterleaveMode interleaveMode;
};
/**
* Capabilities for DTMB Frontend.
*/
struct FrontendDtmbCapabilities {
bitfield<FrontendDtmbTransmissionMode> transmissionModeCap;
bitfield<FrontendDtmbBandwidth> bandwidthCap;
bitfield<FrontendDtmbModulation> modulationCap;
bitfield<FrontendDtmbCodeRate> codeRateCap;
bitfield<FrontendDtmbGuardInterval> guardIntervalCap;
bitfield<FrontendDtmbTimeInterleaveMode> interleaveModeCap;
};
safe_union FrontendModulation {
@1.0::FrontendDvbcModulation dvbc;
@1.0::FrontendDvbsModulation dvbs;
FrontendDvbtConstellation dvbt;
@1.0::FrontendIsdbsModulation isdbs;
@1.0::FrontendIsdbs3Modulation isdbs3;
@1.0::FrontendIsdbtModulation isdbt;
@1.0::FrontendAtscModulation atsc;
@1.0::FrontendAtsc3Modulation atsc3;
FrontendDtmbModulation dtmb;
};
safe_union FrontendInterleaveMode {
@1.0::FrontendAtsc3TimeInterleaveMode atsc3;
FrontendDtmbTimeInterleaveMode dtmb;
};
@export
enum FrontendInnerFec : @1.0::FrontendInnerFec {
FEC_2_15 = 1 << 36,
FEC_3_15 = 1 << 37,
FEC_5_15 = 1 << 38,
FEC_6_15 = 1 << 39,
FEC_9_15 = 1 << 40,
FEC_10_15 = 1 << 41,
FEC_12_15 = 1 << 42,
FEC_13_15 = 1 << 43,
FEC_18_30 = 1 << 44,
FEC_20_30 = 1 << 45,
FEC_90_180 = 1 << 46,
FEC_96_180 = 1 << 47,
FEC_104_180 = 1 << 48,
FEC_128_180 = 1 << 49,
FEC_132_180 = 1 << 50,
FEC_135_180 = 1 << 51,
FEC_140_180 = 1 << 52,
};
safe_union FrontendBandwidth {
@1.0::FrontendAtsc3Bandwidth atsc3;
@1.0::FrontendDvbtBandwidth dvbt;
@1.0::FrontendIsdbtBandwidth isdbt;
FrontendDtmbBandwidth dtmb;
};
safe_union FrontendGuardInterval {
@1.0::FrontendDvbtGuardInterval dvbt;
@1.0::FrontendIsdbtGuardInterval isdbt;
FrontendDtmbGuardInterval dtmb;
};
safe_union FrontendTransmissionMode {
FrontendDvbtTransmissionMode dvbt;
@1.0::FrontendIsdbtMode isdbt;
FrontendDtmbTransmissionMode dtmb;
};
@export
enum FrontendStatusTypeExt1_1 : uint32_t {
/**
* Modulation Types.
*/
MODULATIONS = @1.0::FrontendStatusType:ATSC3_PLP_INFO + 1,
/**
* Bit Error Ratios.
*/
BERS,
/**
* Code Rates.
*/
CODERATES,
/**
* Extended Bandwidth.
*/
BANDWIDTH,
/**
* Extended Guard Intervals.
*/
GUARD_INTERVAL,
/**
* Extended Transmission Mode.
*/
TRANSMISSION_MODE,
/**
* Uncorrectable Error Counts of the frontend's Physical Layer Pipe (PLP)
* since the last tune operation.
*/
UEC,
/**
* DVB-T2 System Id.
*/
T2_SYSTEM_ID,
/**
* Frontend Interleaving Modes.
*/
INTERLEAVINGS,
/**
* Segments in ISDB-T Specification of all the channels.
*/
ISDBT_SEGMENTS,
/**
* Transport Stream Data Rate in BPS of the current channel.
*/
TS_DATA_RATES,
};
safe_union FrontendStatusExt1_1 {
/**
* Extended modulation status.
*/
vec<FrontendModulation> modulations;
/**
* Extended bit error ratio status.
*/
vec<uint32_t> bers;
/**
* Extended code rate status.
*/
vec<FrontendInnerFec> codeRates;
/**
* Extended bandwidth status.
*/
FrontendBandwidth bandwidth;
/**
* Extended guard interval status.
*/
FrontendGuardInterval interval;
/**
* Extended transmission mode status.
*/
FrontendTransmissionMode transmissionMode;
/**
* Uncorrectable Error Counts of the frontend's Physical Layer Pipe (PLP)
* since the last tune operation.
*/
uint32_t uec;
/**
* The current DVB-T2 system id status.
*/
uint16_t systemId;
/**
* Frontend Interleaving Modes.
*/
vec<FrontendInterleaveMode> interleaving;
/**
* Segments in ISDB-T Specification of all the channels.
*/
vec<uint8_t> isdbtSegment;
/**
* Transport Stream Data Rate in BPS of the current channel.
*/
vec<uint32_t> tsDataRate;
};

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

@@ -243,118 +243,92 @@ AssertionResult FrontendTests::stopScanFrontend() {
EXPECT_TRUE(mFrontend) << "Test with openFrontendById first.";
Result status;
status = mFrontend->stopScan();
return AssertionResult(status == Result::SUCCESS);
}
void FrontendTests::verifyFrontendStatus(vector<FrontendStatusType> statusTypes,
vector<FrontendStatus> expectStatuses) {
AssertionResult FrontendTests::getFrontendDtmbCaps(uint32_t id) {
Result status;
mService->getFrontendDtmbCapabilities(
id, [&](Result result, const FrontendDtmbCapabilities& /*caps*/) { status = result; });
return AssertionResult(status == Result::SUCCESS);
}
void FrontendTests::verifyFrontendStatusExt1_1(vector<FrontendStatusTypeExt1_1> statusTypes,
vector<FrontendStatusExt1_1> expectStatuses) {
ASSERT_TRUE(mFrontend) << "Frontend is not opened yet.";
Result status;
vector<FrontendStatus> realStatuses;
vector<FrontendStatusExt1_1> realStatuses;
mFrontend->getStatus(statusTypes, [&](Result result, const hidl_vec<FrontendStatus>& statuses) {
status = result;
realStatuses = statuses;
});
sp<android::hardware::tv::tuner::V1_1::IFrontend> frontend_1_1;
frontend_1_1 = android::hardware::tv::tuner::V1_1::IFrontend::castFrom(mFrontend);
if (frontend_1_1 == nullptr) {
EXPECT_TRUE(false) << "Couldn't get 1.1 IFrontend from the Hal implementation.";
return;
}
frontend_1_1->getStatusExt1_1(
statusTypes, [&](Result result, const hidl_vec<FrontendStatusExt1_1>& statuses) {
status = result;
realStatuses = statuses;
});
ASSERT_TRUE(realStatuses.size() == statusTypes.size());
for (int i = 0; i < statusTypes.size(); i++) {
FrontendStatusType type = statusTypes[i];
FrontendStatusTypeExt1_1 type = statusTypes[i];
switch (type) {
case FrontendStatusType::DEMOD_LOCK: {
ASSERT_TRUE(realStatuses[i].isDemodLocked() == expectStatuses[i].isDemodLocked());
case FrontendStatusTypeExt1_1::MODULATIONS: {
// TODO: verify modulations
break;
}
case FrontendStatusType::SNR: {
ASSERT_TRUE(realStatuses[i].snr() == expectStatuses[i].snr());
case FrontendStatusTypeExt1_1::BERS: {
ASSERT_TRUE(std::equal(realStatuses[i].bers().begin(), realStatuses[i].bers().end(),
expectStatuses[i].bers().begin()));
break;
}
case FrontendStatusType::BER: {
ASSERT_TRUE(realStatuses[i].ber() == expectStatuses[i].ber());
case FrontendStatusTypeExt1_1::CODERATES: {
ASSERT_TRUE(std::equal(realStatuses[i].codeRates().begin(),
realStatuses[i].codeRates().end(),
expectStatuses[i].codeRates().begin()));
break;
}
case FrontendStatusType::PER: {
ASSERT_TRUE(realStatuses[i].per() == expectStatuses[i].per());
case FrontendStatusTypeExt1_1::GUARD_INTERVAL: {
// TODO: verify interval
break;
}
case FrontendStatusType::PRE_BER: {
ASSERT_TRUE(realStatuses[i].preBer() == expectStatuses[i].preBer());
case FrontendStatusTypeExt1_1::TRANSMISSION_MODE: {
// TODO: verify tranmission mode
break;
}
case FrontendStatusType::SIGNAL_QUALITY: {
ASSERT_TRUE(realStatuses[i].signalQuality() == expectStatuses[i].signalQuality());
case FrontendStatusTypeExt1_1::UEC: {
ASSERT_TRUE(realStatuses[i].uec() == expectStatuses[i].uec());
break;
}
case FrontendStatusType::SIGNAL_STRENGTH: {
ASSERT_TRUE(realStatuses[i].signalStrength() == expectStatuses[i].signalStrength());
case FrontendStatusTypeExt1_1::T2_SYSTEM_ID: {
ASSERT_TRUE(realStatuses[i].systemId() == expectStatuses[i].systemId());
break;
}
case FrontendStatusType::SYMBOL_RATE: {
ASSERT_TRUE(realStatuses[i].symbolRate() == expectStatuses[i].symbolRate());
case FrontendStatusTypeExt1_1::INTERLEAVINGS: {
ASSERT_TRUE(std::equal(realStatuses[i].interleaving().begin(),
realStatuses[i].interleaving().end(),
expectStatuses[i].interleaving().begin()));
break;
}
case FrontendStatusType::FEC: {
ASSERT_TRUE(realStatuses[i].innerFec() == expectStatuses[i].innerFec());
case FrontendStatusTypeExt1_1::ISDBT_SEGMENTS: {
ASSERT_TRUE(std::equal(realStatuses[i].isdbtSegment().begin(),
realStatuses[i].isdbtSegment().end(),
expectStatuses[i].isdbtSegment().begin()));
break;
}
case FrontendStatusType::MODULATION: {
// TODO: check modulation status
case FrontendStatusTypeExt1_1::TS_DATA_RATES: {
ASSERT_TRUE(std::equal(realStatuses[i].tsDataRate().begin(),
realStatuses[i].tsDataRate().end(),
expectStatuses[i].tsDataRate().begin()));
break;
}
case FrontendStatusType::SPECTRAL: {
ASSERT_TRUE(realStatuses[i].inversion() == expectStatuses[i].inversion());
break;
}
case FrontendStatusType::LNB_VOLTAGE: {
ASSERT_TRUE(realStatuses[i].lnbVoltage() == expectStatuses[i].lnbVoltage());
break;
}
case FrontendStatusType::PLP_ID: {
ASSERT_TRUE(realStatuses[i].plpId() == expectStatuses[i].plpId());
break;
}
case FrontendStatusType::EWBS: {
ASSERT_TRUE(realStatuses[i].isEWBS() == expectStatuses[i].isEWBS());
break;
}
case FrontendStatusType::AGC: {
ASSERT_TRUE(realStatuses[i].agc() == expectStatuses[i].agc());
break;
}
case FrontendStatusType::LNA: {
ASSERT_TRUE(realStatuses[i].isLnaOn() == expectStatuses[i].isLnaOn());
break;
}
case FrontendStatusType::LAYER_ERROR: {
vector<bool> realLayberError = realStatuses[i].isLayerError();
vector<bool> expectLayerError = expectStatuses[i].isLayerError();
ASSERT_TRUE(realLayberError.size() == expectLayerError.size());
for (int i = 0; i < realLayberError.size(); i++) {
ASSERT_TRUE(realLayberError[i] == expectLayerError[i]);
}
break;
}
case FrontendStatusType::MER: {
ASSERT_TRUE(realStatuses[i].mer() == expectStatuses[i].mer());
break;
}
case FrontendStatusType::FREQ_OFFSET: {
ASSERT_TRUE(realStatuses[i].freqOffset() == expectStatuses[i].freqOffset());
break;
}
case FrontendStatusType::HIERARCHY: {
ASSERT_TRUE(realStatuses[i].hierarchy() == expectStatuses[i].hierarchy());
break;
}
case FrontendStatusType::RF_LOCK: {
ASSERT_TRUE(realStatuses[i].isRfLocked() == expectStatuses[i].isRfLocked());
break;
}
case FrontendStatusType::ATSC3_PLP_INFO:
// TODO: verify plpinfo
break;
default:
default: {
continue;
}
}
}
ASSERT_TRUE(status == Result::SUCCESS);
@@ -425,7 +399,7 @@ void FrontendTests::tuneTest(FrontendConfig frontendConf) {
ASSERT_TRUE(openFrontendById(feId));
ASSERT_TRUE(setFrontendCallback());
ASSERT_TRUE(tuneFrontend(frontendConf, false /*testWithDemux*/));
verifyFrontendStatus(frontendConf.tuneStatusTypes, frontendConf.expectTuneStatuses);
verifyFrontendStatusExt1_1(frontendConf.tuneStatusTypes, frontendConf.expectTuneStatuses);
ASSERT_TRUE(stopTuneFrontend(false /*testWithDemux*/));
ASSERT_TRUE(closeFrontend());
}
@@ -440,3 +414,14 @@ void FrontendTests::scanTest(FrontendConfig frontendConf, FrontendScanType scanT
ASSERT_TRUE(stopScanFrontend());
ASSERT_TRUE(closeFrontend());
}
void FrontendTests::getFrontendDtmbCapsTest() {
uint32_t feId;
getFrontendIdByType(
static_cast<FrontendType>(android::hardware::tv::tuner::V1_1::FrontendType::DTMB),
feId);
if (feId != INVALID_ID) {
ALOGD("[vts] Found DTMB Frontend");
ASSERT_TRUE(getFrontendDtmbCaps(feId));
}
}

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

@@ -56,6 +56,7 @@ using android::hardware::tv::tuner::V1_0::FrontendScanType;
using android::hardware::tv::tuner::V1_0::IFrontend;
using android::hardware::tv::tuner::V1_0::IFrontendCallback;
using android::hardware::tv::tuner::V1_0::Result;
using android::hardware::tv::tuner::V1_1::FrontendDtmbCapabilities;
using android::hardware::tv::tuner::V1_1::ITuner;
using ::testing::AssertionResult;
@@ -109,14 +110,16 @@ class FrontendTests {
AssertionResult scanFrontend(FrontendConfig config, FrontendScanType type);
AssertionResult stopScanFrontend();
AssertionResult tuneFrontend(FrontendConfig config, bool testWithDemux);
void verifyFrontendStatus(vector<FrontendStatusType> statusTypes,
vector<FrontendStatus> expectStatuses);
void verifyFrontendStatusExt1_1(vector<FrontendStatusTypeExt1_1> statusTypes,
vector<FrontendStatusExt1_1> expectStatuses);
AssertionResult stopTuneFrontend(bool testWithDemux);
AssertionResult closeFrontend();
AssertionResult getFrontendDtmbCaps(uint32_t);
void getFrontendIdByType(FrontendType feType, uint32_t& feId);
void tuneTest(FrontendConfig frontendConf);
void scanTest(FrontendConfig frontend, FrontendScanType type);
void getFrontendDtmbCapsTest();
void setDvrTests(DvrTests dvrTests) { mDvrTests = dvrTests; }
void setDemux(sp<IDemux> demux) { mDvrTests.setDemux(demux); }

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

@@ -157,6 +157,11 @@ TEST_P(TunerBroadcastHidlTest, MediaFilterWithSharedMemoryHandle) {
mediaFilterUsingSharedMemoryTest(filterArray[TS_VIDEO0], frontendArray[DVBT]);
}
TEST_P(TunerFrontendHidlTest, GetFrontendDtmbCaps) {
description("Test to query Dtmb frontend caps if exists");
mFrontendTests.getFrontendDtmbCapsTest();
}
INSTANTIATE_TEST_SUITE_P(
PerInstance, TunerBroadcastHidlTest,
testing::ValuesIn(android::hardware::getAllHalInstanceNames(ITuner::descriptor)),

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

@@ -43,12 +43,12 @@ using android::hardware::tv::tuner::V1_0::FrontendDvbtSettings;
using android::hardware::tv::tuner::V1_0::FrontendDvbtStandard;
using android::hardware::tv::tuner::V1_0::FrontendDvbtTransmissionMode;
using android::hardware::tv::tuner::V1_0::FrontendSettings;
using android::hardware::tv::tuner::V1_0::FrontendStatus;
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::FrontendSettingsExt1_1;
using android::hardware::tv::tuner::V1_1::FrontendStatusExt1_1;
using android::hardware::tv::tuner::V1_1::FrontendStatusTypeExt1_1;
using namespace std;
@@ -101,8 +101,8 @@ struct FrontendConfig {
FrontendType type;
FrontendSettings settings;
FrontendSettingsExt1_1 settingsExt1_1;
vector<FrontendStatusType> tuneStatusTypes;
vector<FrontendStatus> expectTuneStatuses;
vector<FrontendStatusTypeExt1_1> tuneStatusTypes;
vector<FrontendStatusExt1_1> expectTuneStatuses;
};
struct DvrConfig {
@@ -132,11 +132,11 @@ inline void initFrontendConfig() {
.standard = FrontendDvbtStandard::T,
};
frontendArray[DVBT].type = FrontendType::DVBT, frontendArray[DVBT].settings.dvbt(dvbtSettings);
vector<FrontendStatusType> types;
types.push_back(FrontendStatusType::DEMOD_LOCK);
FrontendStatus status;
status.isDemodLocked(true);
vector<FrontendStatus> statuses;
vector<FrontendStatusTypeExt1_1> types;
types.push_back(FrontendStatusTypeExt1_1::UEC);
FrontendStatusExt1_1 status;
status.uec(4);
vector<FrontendStatusExt1_1> statuses;
statuses.push_back(status);
frontendArray[DVBT].tuneStatusTypes = types;
frontendArray[DVBT].expectTuneStatuses = statuses;