Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d99c82dc authored by Hongguang's avatar Hongguang
Browse files

Support not tuned PLP info query. 

Bug: 209762260
Test: atest VtsHalTvTunerTargetTest
Change-Id: Iefc02ae7f4145cfabae8c5a5d60f28ef02ec9bc0
parent 6eef5c1e

tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendStatus.aidl

+1 −0
Original line number Diff line number Diff line
@@ -76,4 +76,5 @@ union FrontendStatus { 
  android.hardware.tv.tuner.FrontendIsdbtPartialReceptionFlag partialReceptionFlag;

  int[] streamIdList;

  int[] dvbtCellIds;

  android.hardware.tv.tuner.FrontendScanAtsc3PlpInfo[] allPlpInfo;

}

tv/tuner/aidl/aidl_api/android.hardware.tv.tuner/current/android/hardware/tv/tuner/FrontendStatusType.aidl

+1 −0
Original line number Diff line number Diff line
@@ -76,4 +76,5 @@ enum FrontendStatusType { 
  ISDBT_PARTIAL_RECEPTION_FLAG = 38,

  STREAM_ID_LIST = 39,

  DVBT_CELL_IDS = 40,

  ATSC3_ALL_PLP_INFO = 41,

}

tv/tuner/aidl/android/hardware/tv/tuner/FrontendStatus.aidl

+6 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.hardware.tv.tuner.FrontendModulation; 
import android.hardware.tv.tuner.FrontendModulationStatus;

import android.hardware.tv.tuner.FrontendRollOff;

import android.hardware.tv.tuner.FrontendSpectralInversion;

import android.hardware.tv.tuner.FrontendScanAtsc3PlpInfo;

import android.hardware.tv.tuner.FrontendStatusAtsc3PlpInfo;

import android.hardware.tv.tuner.FrontendTransmissionMode;

import android.hardware.tv.tuner.LnbVoltage;
@@ -241,5 +242,9 @@ union FrontendStatus { 
     */

    int[] dvbtCellIds;





    /**

     * A list of all PLPs in the frequency band for ATSC3 frontend, which includes both tuned

     * and not tuned PLPs for currently watching service.

     */

    FrontendScanAtsc3PlpInfo[] allPlpInfo;

}

tv/tuner/aidl/android/hardware/tv/tuner/FrontendStatusType.aidl

+12 −6
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ enum FrontendStatusType { 
    RF_LOCK,



    /**

     * PLP information in a frequency band for ATSC3.0 frontend.

     * Current tuned PLP information in a frequency band for ATSC3 frontend.

     */

    ATSC3_PLP_INFO,
@@ -228,4 +228,10 @@ enum FrontendStatusType { 
     * DVB-T Cell Id.

     */

    DVBT_CELL_IDS,



    /**

     * All PLP information in a frequency band for ATSC3 frontend, which includes both tuned

     * and not tuned PLPs for currently watching service.

     */

    ATSC3_ALL_PLP_INFO,

}

tv/tuner/aidl/default/Frontend.cpp

+14 −0
Original line number Diff line number Diff line
@@ -708,6 +708,20 @@ void Frontend::scanThreadLoop() { 
                status.set<FrontendStatus::dvbtCellIds>(dvbtCellIds);

                break;

            }

            case FrontendStatusType::ATSC3_ALL_PLP_INFO: {

                FrontendScanAtsc3PlpInfo info1;

                info1.plpId = 1;

                info1.bLlsFlag = false;

                FrontendScanAtsc3PlpInfo info2;

                info2.plpId = 2;

                info2.bLlsFlag = true;

                FrontendScanAtsc3PlpInfo info3;

                info3.plpId = 3;

                info3.bLlsFlag = false;

                vector<FrontendScanAtsc3PlpInfo> infos = {info1, info2, info3};

                status.set<FrontendStatus::allPlpInfo>(infos);

                break;

            }

            default: {

                continue;

            }