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

Commit fcedda02 authored by Hongguang's avatar Hongguang
Browse files

Add new features to tuner AIDL HAL. 

*) Adding key frame info (ScIndexMask) to DemuxFilterMediaEvent.
*) Add more AAC formats.
*) Support dumping frontend hardware information.
*) Move LNA from IFrontend to ITuner.

Bug: 202978951
Bug: 205265630
Bug: 184017033
Bug: 203623028
Test: atest VtsHalTvTunerTargetTest
Change-Id: I8256da7f41c96d7de66d2796dd35c51637078da0
parent 77b74ffc

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

+4 −0
Original line number Diff line number Diff line
@@ -51,4 +51,8 @@ enum AudioStreamType { 
  OPUS = 13,

  VORBIS = 14,

  DRA = 15,

  AAC_ADTS = 16,

  AAC_LATM = 17,

  AAC_HE_ADTS = 18,

  AAC_HE_LATM = 19,

}

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

+1 −0
Original line number Diff line number Diff line
@@ -48,4 +48,5 @@ parcelable DemuxFilterMediaEvent { 
  int mpuSequenceNumber;

  boolean isPesPrivateData;

  android.hardware.tv.tuner.DemuxFilterMediaEventExtraMetaData extraMetaData;

  android.hardware.tv.tuner.DemuxFilterScIndexMask scIndexMask;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ interface IFrontend { 
  void stopScan();

  android.hardware.tv.tuner.FrontendStatus[] getStatus(in android.hardware.tv.tuner.FrontendStatusType[] statusTypes);

  void setLnb(in int lnbId);

  void setLna(in boolean bEnable);

  int linkCiCam(in int ciCamId);

  void unlinkCiCam(in int ciCamId);

  String getHardwareInfo();

}

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

+1 −0
Original line number Diff line number Diff line
@@ -44,4 +44,5 @@ interface ITuner { 
  int[] getLnbIds();

  android.hardware.tv.tuner.ILnb openLnbById(in int lnbId);

  android.hardware.tv.tuner.ILnb openLnbByName(in String lnbName, out int[] lnbId);

  void setLna(in boolean bEnable);

}

tv/tuner/aidl/android/hardware/tv/tuner/AudioStreamType.aidl

+20 −0
Original line number Diff line number Diff line
@@ -99,4 +99,24 @@ enum AudioStreamType { 
     * SJ/T 11368-2006

     */

    DRA,



    /*

     * AAC with ADTS (Audio Data Transport Format).

     */

    AAC_ADTS,



    /*

     * AAC with ADTS with LATM (Low-overhead MPEG-4 Audio Transport Multiplex).

     */

    AAC_LATM,



    /*

     * High-Efficiency AAC (HE-AAC) with ADTS (Audio Data Transport Format).

     */

    AAC_HE_ADTS,



    /*

     * High-Efficiency AAC (HE-AAC) with LATM (Low-overhead MPEG-4 Audio Transport Multiplex).

     */

    AAC_HE_LATM,

}