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

Commit 4699ec63 authored by Amy Zhang's avatar Amy Zhang
Browse files

Extend DVBT Constellation to report the rotation status 

Test: make
Bug:
Change-Id: I24356125ec889c313459beba5e3caef2d3413fa7
parent c428f2cb

tv/tuner/1.1/IFilterCallback.hal

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.hardware.tv.tuner@1.1; 


import @1.0::IFilterCallback;

import @1.0::DemuxFilterEvent;

import @1.1::DemuxFilterEventExt;

import DemuxFilterEventExt;



interface IFilterCallback extends @1.0::IFilterCallback {

    /**

tv/tuner/1.1/IFrontend.hal

+3 −2
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ interface IFrontend extends @1.0::IFrontend { 
     *         INVALID_STATE if tuning can't be applied at current stage,

     *         UNKNOWN_ERROR if tuning failed for other reasons.

     */

    tune_1_1(FrontendSettings settings, FrontendSettingsExt settingsExt) generates (Result result);

    tune_1_1(FrontendSettings settings, FrontendSettingsExt settingsExt)

        generates (Result result);



    /**

     * Scan the frontend to use the settings given.

tv/tuner/1.1/types.hal

+13 −13
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import @1.0::Constant; 
import @1.0::DemuxFilterMmtpRecordEvent;

import @1.0::DemuxFilterTsRecordEvent;

import @1.0::FrontendDvbcSpectralInversion;

import @1.0::FrontendDvbtConstellation;

import @1.0::FrontendDvbtTransmissionMode;

import android.hidl.safe_union@1.0;

import android.hidl.safe_union@1.0::Monostate;
@@ -105,16 +106,6 @@ enum FrontendDvbsScanType : uint32_t { 
    JESS,

};



/**

 *  Rotation status for a DVBT Frontend.

 */

@export

enum FrontendDvbtRotation : uint32_t {

    UNDEFINED,

    NOT_ROTATED,

    ROTATED,

};



/**

 * AFT flag for an Analog Frontend.

 */
@@ -131,12 +122,21 @@ enum FrontendAnalogAftFlag : uint32_t { 
@export

enum FrontendDvbtTransmissionMode : @1.0::FrontendDvbtTransmissionMode {

    MODE_8K_E = 1 << 7,



    MODE_16K_E = 1 << 8,



    MODE_32K_E = 1 << 9,

};



/**

 *  Extended Constellation for DVBT.

 */

@export

enum FrontendDvbtConstellation : @1.0::FrontendDvbtConstellation {

    CONSTELLATION_QPSK_R = 1 << 5,

    CONSTELLATION_16QAM_R = 1 << 6,

    CONSTELLATION_64QAM_R = 1 << 7,

    CONSTELLATION_256QAM_R = 1 << 8,

};



/**

 *  Extended Signal Settings for a DVBS Frontend.

 */
@@ -148,7 +148,7 @@ struct FrontendDvbsSettingsExt { 
 *  Extended Signal Settings for a DVBT Frontend.

 */

struct FrontendDvbtSettingsExt {

    FrontendDvbtRotation rotation;

    FrontendDvbtConstellation constellation;



    FrontendDvbtTransmissionMode transmissionMode;

};