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

Commit d94fa740 authored by Hongguang's avatar Hongguang
Browse files

Use Tuner AIDL HAL data structures in the TunerService. 

After moving to AIDL HAL, the HAL data structures can be used in
TunerService directly, we don't need to define them twice.

Bug: 191825295
Test: atest android.media.tv.tuner.cts
Change-Id: I0e2c7e950cae11bcfa1792c93b06ed28f4152628
parent 36510b50

services/tuner/Android.bp

+4 −47
Original line number Diff line number Diff line
@@ -7,33 +7,15 @@ package { 
    default_applicable_licenses: ["frameworks_av_license"],

}



filegroup {

    name: "tv_tuner_aidl",

    srcs: [

        "aidl/android/media/tv/tuner/*.aidl",

    ],

    path: "aidl",

}



filegroup {

    name: "tv_tuner_frontend_info",

    srcs: [

        "aidl/android/media/tv/tuner/TunerFrontendInfo.aidl",

        "aidl/android/media/tv/tuner/TunerFrontend*Capabilities.aidl",

    ],

    path: "aidl",

}



aidl_interface {

    name: "tv_tuner_aidl_interface",

    unstable: true,

    local_include_dir: "aidl",

    srcs: [

        ":tv_tuner_aidl",

    ],

    srcs: ["aidl/android/media/tv/tuner/*.aidl"],

    imports: [

        "android.hardware.common-V2",

        "android.hardware.common.fmq-V1",

        "android.hardware.tv.tuner-V1",

    ],



    backend: {
@@ -49,27 +31,6 @@ aidl_interface { 
    },

}



aidl_interface {

    name: "tv_tuner_frontend_info_aidl_interface",

    unstable: true,

    local_include_dir: "aidl",

    srcs: [

        ":tv_tuner_frontend_info",

    ],



    backend: {

        java: {

            enabled: true,

        },

        cpp: {

            enabled: true,

        },

        ndk: {

            enabled: true,

        },

    },

}



cc_library {

    name: "libtunerservice",
@@ -78,8 +39,7 @@ cc_library { 
    ],



    shared_libs: [

        "android.hardware.tv.tuner@1.0",

        "android.hardware.tv.tuner@1.1",

        "android.hardware.tv.tuner-V1-ndk",

        "libbase",

        "libbinder",

        "libbinder_ndk",
@@ -91,7 +51,6 @@ cc_library { 
        "libutils",

        "tv_tuner_aidl_interface-ndk",

        "tv_tuner_resource_manager_aidl_interface-ndk",

        "tv_tuner_resource_manager_aidl_interface-cpp",

    ],



    static_libs: [
@@ -120,8 +79,7 @@ cc_binary { 
    ],



    shared_libs: [

        "android.hardware.tv.tuner@1.0",

        "android.hardware.tv.tuner@1.1",

        "android.hardware.tv.tuner-V1-ndk",

        "libbase",

        "libbinder",

        "libfmq",
@@ -129,7 +87,6 @@ cc_binary { 
        "libtunerservice",

        "libutils",

        "tv_tuner_resource_manager_aidl_interface-ndk",

        "tv_tuner_resource_manager_aidl_interface-cpp",

    ],



    static_libs: [

services/tuner/aidl/android/media/tv/OWNERS

+1 −1
Original line number Diff line number Diff line 
nchalko@google.com

hgchen@google.com

quxiangfang@google.com

services/tuner/aidl/android/media/tv/tuner/ITunerDemux.aidl

+5 −3
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.media.tv.tuner;



import android.hardware.tv.tuner.DemuxFilterType;

import android.hardware.tv.tuner.DvrType;

import android.media.tv.tuner.ITunerDvr;

import android.media.tv.tuner.ITunerDvrCallback;

import android.media.tv.tuner.ITunerFilter;
@@ -43,8 +45,8 @@ interface ITunerDemux { 
    /**

     * Open a new filter in the demux

     */

    ITunerFilter openFilter(

        in int mainType, in int subtype, in int bufferSize, in ITunerFilterCallback cb);

    ITunerFilter openFilter(in DemuxFilterType type, in int bufferSize,

        in ITunerFilterCallback cb);



    /**

     * Open time filter of the demux.
@@ -64,7 +66,7 @@ interface ITunerDemux { 
    /**

     * Open a DVR (Digital Video Record) instance in the demux.

     */

    ITunerDvr openDvr(in int dvbType, in int bufferSize, in ITunerDvrCallback cb);

    ITunerDvr openDvr(in DvrType dvbType, in int bufferSize, in ITunerDvrCallback cb);



    /**

     * Connect Conditional Access Modules (CAM) through Common Interface (CI).

services/tuner/aidl/android/media/tv/tuner/ITunerDescrambler.aidl

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


package android.media.tv.tuner;



import android.hardware.tv.tuner.DemuxPid;

import android.media.tv.tuner.ITunerDemux;

import android.media.tv.tuner.ITunerFilter;

import android.media.tv.tuner.TunerDemuxPid;



/**

 * Tuner Demux interface handles tuner related operations.
@@ -39,12 +39,12 @@ interface ITunerDescrambler { 
    /**

     * Add packets' PID to the descrambler for descrambling.

     */

    void addPid(in TunerDemuxPid pid, in ITunerFilter optionalSourceFilter);

    void addPid(in DemuxPid pid, in ITunerFilter optionalSourceFilter);



    /**

     * Remove packets' PID from the descrambler.

     */

    void removePid(in TunerDemuxPid pid, in ITunerFilter optionalSourceFilter);

    void removePid(in DemuxPid pid, in ITunerFilter optionalSourceFilter);



    /**

     * Close a new interface of ITunerDescrambler.

services/tuner/aidl/android/media/tv/tuner/ITunerDvr.aidl

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package android.media.tv.tuner; 


import android.hardware.common.fmq.MQDescriptor;

import android.hardware.common.fmq.SynchronizedReadWrite;

import android.hardware.tv.tuner.DvrSettings;

import android.media.tv.tuner.ITunerFilter;

import android.media.tv.tuner.TunerDvrSettings;



/**

 * Tuner Dvr interface handles tuner related operations.
@@ -35,7 +35,7 @@ interface ITunerDvr { 
    /**

     * Configure the DVR.

     */

    void configure(in TunerDvrSettings settings);

    void configure(in DvrSettings settings);



    /**

     * Attach one filter to DVR interface for recording.