commit b0c1bbb3546ba8fa6dd64808381e2712a08e454b
author shubang <shubang@google.com> Mon Apr 06 22:41:33 2020 -0700
committer shubang <shubang@google.com> Thu Apr 09 16:57:54 2020 -0700
tree 6ffe72ec93caebec4ab2991626e74b08dac5d0e3
parent 1826302984db44a9f8eb25def50d970d7feb40ce

Add frontend caps for CTS

Bug: 150952758
Test: atest android.media.tv.tuner.cts.TunerTest
Change-Id: I5bf1fbf24ef6375b08554617bcd05792e7e9e521

tv/tuner/1.0/default/Tuner.cpp

diff --git a/tv/tuner/1.0/default/Tuner.cpp b/tv/tuner/1.0/default/Tuner.cpp
index 6f9a5cf..e39333c 100644
--- a/tv/tuner/1.0/default/Tuner.cpp
+++ b/tv/tuner/1.0/default/Tuner.cpp
@@ -46,6 +46,48 @@
     mFrontends[5] = new Frontend(FrontendType::ISDBT, 5, this);
     mFrontends[6] = new Frontend(FrontendType::ANALOG, 6, this);
     mFrontends[7] = new Frontend(FrontendType::ATSC, 7, this);
+
+    FrontendInfo::FrontendCapabilities caps;
+    mFrontendCaps.resize(mFrontendSize);
+    caps = FrontendInfo::FrontendCapabilities();
+    caps.dvbtCaps(FrontendDvbtCapabilities());
+    mFrontendCaps[0] = caps;
+
+    caps = FrontendInfo::FrontendCapabilities();
+    caps.atscCaps(FrontendAtscCapabilities());
+    mFrontendCaps[1] = caps;
+
+    caps = FrontendInfo::FrontendCapabilities();
+    caps.dvbcCaps(FrontendDvbcCapabilities());
+    mFrontendCaps[2] = caps;
+
+    caps = FrontendInfo::FrontendCapabilities();
+    caps.dvbsCaps(FrontendDvbsCapabilities());
+    mFrontendCaps[3] = caps;
+
+    caps = FrontendInfo::FrontendCapabilities();
+    caps.dvbtCaps(FrontendDvbtCapabilities());
+    mFrontendCaps[4] = caps;
+
+    caps = FrontendInfo::FrontendCapabilities();
+    FrontendIsdbtCapabilities isdbtCaps{
+            .modeCap = FrontendIsdbtMode::MODE_1 | FrontendIsdbtMode::MODE_2,
+            .bandwidthCap = (unsigned int)FrontendIsdbtBandwidth::BANDWIDTH_6MHZ,
+            .modulationCap = (unsigned int)FrontendIsdbtModulation::MOD_16QAM,
+            // ISDBT shares coderate and guard interval with DVBT
+            .coderateCap = FrontendDvbtCoderate::CODERATE_4_5 | FrontendDvbtCoderate::CODERATE_6_7,
+            .guardIntervalCap = (unsigned int)FrontendDvbtGuardInterval::INTERVAL_1_128,
+    };
+    caps.isdbtCaps(isdbtCaps);
+    mFrontendCaps[5] = caps;
+
+    caps = FrontendInfo::FrontendCapabilities();
+    caps.analogCaps(FrontendAnalogCapabilities());
+    mFrontendCaps[6] = caps;
+
+    caps = FrontendInfo::FrontendCapabilities();
+    caps.atscCaps(FrontendAtscCapabilities());
+    mFrontendCaps[7] = caps;
 }
 
 Tuner::~Tuner() {}
@@ -129,20 +171,9 @@
                     FrontendStatusType::LAYER_ERROR,
                     FrontendStatusType::ATSC3_PLP_INFO,
             };
-            FrontendInfo::FrontendCapabilities frontendCaps;
-            FrontendIsdbtCapabilities isdbtCaps{
-                    .modeCap = FrontendIsdbtMode::MODE_1 | FrontendIsdbtMode::MODE_2,
-                    .bandwidthCap = (unsigned int)FrontendIsdbtBandwidth::BANDWIDTH_6MHZ,
-                    .modulationCap = (unsigned int)FrontendIsdbtModulation::MOD_16QAM,
-                    // ISDBT shares coderate and guard interval with DVBT
-                    .coderateCap =
-                            FrontendDvbtCoderate::CODERATE_4_5 | FrontendDvbtCoderate::CODERATE_6_7,
-                    .guardIntervalCap = (unsigned int)FrontendDvbtGuardInterval::INTERVAL_1_128,
-            };
-            frontendCaps.isdbtCaps(isdbtCaps);
             // assign randomly selected values for testing.
             info = {
-                    .type = FrontendType::ISDBT,
+                    .type = mFrontends[frontendId]->getFrontendType(),
                     .minFrequency = 139,
                     .maxFrequency = 1139,
                     .minSymbolRate = 45,
@@ -150,7 +181,7 @@
                     .acquireRange = 30,
                     .exclusiveGroupId = 57,
                     .statusCaps = statusCaps,
-                    .frontendCaps = frontendCaps,
+                    .frontendCaps = mFrontendCaps[frontendId],
             };
             break;
     }