Update tuner AIDL default implementation.
*) Fix ISDBT Frontend in the default implementation.
*) Merge ag/15455889.
Bug: 191825295
Test: atest VtsHalTvTunerTargetTest
Change-Id: I70029cfc856aadcdfda0d3c3a1eb1a80f9674e25
diff --git a/tv/tuner/aidl/default/Filter.cpp b/tv/tuner/aidl/default/Filter.cpp
index 6c4b28c..77ca2ee 100644
--- a/tv/tuner/aidl/default/Filter.cpp
+++ b/tv/tuner/aidl/default/Filter.cpp
@@ -519,7 +519,7 @@
return mTpid;
}
-void Filter::updateFilterOutput(vector<int8_t> data) {
+void Filter::updateFilterOutput(vector<int8_t>& data) {
std::lock_guard<std::mutex> lock(mFilterOutputLock);
mFilterOutput.insert(mFilterOutput.end(), data.begin(), data.end());
}
@@ -529,7 +529,7 @@
mPts = pts;
}
-void Filter::updateRecordOutput(vector<int8_t> data) {
+void Filter::updateRecordOutput(vector<int8_t>& data) {
std::lock_guard<std::mutex> lock(mRecordFilterOutputLock);
mRecordFilterOutput.insert(mRecordFilterOutput.end(), data.begin(), data.end());
}
diff --git a/tv/tuner/aidl/default/Filter.h b/tv/tuner/aidl/default/Filter.h
index 7a037e6..4bb1a72 100644
--- a/tv/tuner/aidl/default/Filter.h
+++ b/tv/tuner/aidl/default/Filter.h
@@ -83,8 +83,8 @@
*/
bool createFilterMQ();
uint16_t getTpid();
- void updateFilterOutput(vector<int8_t> data);
- void updateRecordOutput(vector<int8_t> data);
+ void updateFilterOutput(vector<int8_t>& data);
+ void updateRecordOutput(vector<int8_t>& data);
void updatePts(uint64_t pts);
::ndk::ScopedAStatus startFilterHandler();
::ndk::ScopedAStatus startRecordFilterHandler();
diff --git a/tv/tuner/aidl/default/Frontend.cpp b/tv/tuner/aidl/default/Frontend.cpp
index 7f7b989..438f897 100644
--- a/tv/tuner/aidl/default/Frontend.cpp
+++ b/tv/tuner/aidl/default/Frontend.cpp
@@ -532,7 +532,7 @@
}
case FrontendType::ISDBT: {
interval.set<FrontendGuardInterval::Tag::isdbt>(
- FrontendDvbtGuardInterval::INTERVAL_1_32); // value = 1 << 1
+ FrontendIsdbtGuardInterval::INTERVAL_1_32); // value = 1 << 1
status.set<FrontendStatus::interval>(interval);
break;
}
diff --git a/tv/tuner/aidl/default/Tuner.cpp b/tv/tuner/aidl/default/Tuner.cpp
index 8335ffa..94c90a7 100644
--- a/tv/tuner/aidl/default/Tuner.cpp
+++ b/tv/tuner/aidl/default/Tuner.cpp
@@ -114,10 +114,9 @@
.modeCap = (int)FrontendIsdbtMode::MODE_1 | (int)FrontendIsdbtMode::MODE_2,
.bandwidthCap = (int)FrontendIsdbtBandwidth::BANDWIDTH_6MHZ,
.modulationCap = (int)FrontendIsdbtModulation::MOD_16QAM,
- // ISDBT shares coderate and guard interval with DVBT
- .coderateCap = (int)FrontendDvbtCoderate::CODERATE_4_5 |
- (int)FrontendDvbtCoderate::CODERATE_6_7,
- .guardIntervalCap = (int)FrontendDvbtGuardInterval::INTERVAL_1_128,
+ .coderateCap = (int)FrontendIsdbtCoderate::CODERATE_4_5 |
+ (int)FrontendIsdbtCoderate::CODERATE_6_7,
+ .guardIntervalCap = (int)FrontendIsdbtGuardInterval::INTERVAL_1_128,
};
capsIsdbt.set<FrontendCapabilities::Tag::isdbtCaps>(isdbtCaps);
mFrontendCaps[5] = capsIsdbt;