commit dd05ec3407d218f888d030884966df0e00beb7ca
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 11 03:37:21 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 11 03:37:21 2021 +0000
tree eaf91da1e7ca7edd4ea081ee53721cf243b56f54
parent c12a30762e3704810bf39b840b5c9bc033d9d00c
parent 6f1d098633cb7dbc34f176542427abcb083c71cb

Merge "Add more status capabilities in Tuner default implementation" into sc-dev am: 6f1d098633

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13526687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20062e8dd88e2a2164338106eab532e5ff402402

tv/tuner/1.1/default/Frontend.cpp

diff --git a/tv/tuner/1.1/default/Frontend.cpp b/tv/tuner/1.1/default/Frontend.cpp
index 6956f30..243891c 100644
--- a/tv/tuner/1.1/default/Frontend.cpp
+++ b/tv/tuner/1.1/default/Frontend.cpp
@@ -196,7 +196,7 @@
             }
             case FrontendStatusType::MODULATION: {
                 FrontendModulationStatus modulationStatus;
-                modulationStatus.isdbt(FrontendIsdbtModulation::MOD_16QAM);  // value = 1 << 3
+                modulationStatus.isdbs(FrontendIsdbsModulation::MOD_BPSK);  // value = 1 << 1
                 status.modulation(modulationStatus);
                 break;
             }
@@ -281,12 +281,14 @@
     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.
+        // TODO: assign status values according to the frontend type
         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
+                modulation.isdbs(FrontendIsdbsModulation::MOD_BPSK);  // value = 1 << 1
                 modulations.push_back(modulation);
                 status.modulations(modulations);
                 break;
@@ -347,7 +349,7 @@
             }
             case V1_1::FrontendStatusTypeExt1_1::ROLL_OFF: {
                 V1_1::FrontendRollOff rollOff;
-                rollOff.dvbs(FrontendDvbsRolloff::ROLLOFF_0_35);
+                rollOff.isdbs(FrontendIsdbsRolloff::ROLLOFF_0_35);
                 status.rollOff(rollOff);
                 break;
             }

tv/tuner/1.1/default/Tuner.cpp

diff --git a/tv/tuner/1.1/default/Tuner.cpp b/tv/tuner/1.1/default/Tuner.cpp
index c3dcd1d..6cc9949 100644
--- a/tv/tuner/1.1/default/Tuner.cpp
+++ b/tv/tuner/1.1/default/Tuner.cpp
@@ -34,7 +34,7 @@
     // Static Frontends array to maintain local frontends information
     // Array index matches their FrontendId in the default impl
     mFrontendSize = 9;
-    mFrontends[0] = new Frontend(FrontendType::DVBT, 0, this);
+    mFrontends[0] = new Frontend(FrontendType::ISDBS, 0, this);
     mFrontends[1] = new Frontend(FrontendType::ATSC, 1, this);
     mFrontends[2] = new Frontend(FrontendType::DVBC, 2, this);
     mFrontends[3] = new Frontend(FrontendType::DVBS, 3, this);
@@ -47,7 +47,7 @@
 
     FrontendInfo::FrontendCapabilities caps;
     caps = FrontendInfo::FrontendCapabilities();
-    caps.dvbtCaps(FrontendDvbtCapabilities());
+    caps.isdbsCaps(FrontendIsdbsCapabilities());
     mFrontendCaps[0] = caps;
 
     caps = FrontendInfo::FrontendCapabilities();
@@ -168,6 +168,8 @@
             FrontendStatusType::PLP_ID,
             FrontendStatusType::LAYER_ERROR,
             FrontendStatusType::ATSC3_PLP_INFO,
+            static_cast<FrontendStatusType>(V1_1::FrontendStatusTypeExt1_1::MODULATIONS),
+            static_cast<FrontendStatusType>(V1_1::FrontendStatusTypeExt1_1::ROLL_OFF),
     };
     // assign randomly selected values for testing.
     info = {