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

Commit 1d28bbb5 authored by Amy Zhang's avatar Amy Zhang
Browse files

Use TunerFrontendInfo for both TRM and TunerService 

Test: make
Bug: 172079283
Change-Id: I10a614ff8b83ad7227cea7285e87b7206eafae0d
parent d61491e8

services/tuner/Android.bp

+30 −0
Original line number Diff line number Diff line
@@ -6,6 +6,15 @@ filegroup { 
    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,
@@ -30,6 +39,27 @@ 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",

services/tuner/TunerService.cpp

+4 −5
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ Status TunerService::getFrontendIds(std::vector<int32_t>* ids, int32_t* /* _aidl 
}



Status TunerService::getFrontendInfo(

        int32_t frontendHandle, TunerServiceFrontendInfo* _aidl_return) {

        int32_t frontendHandle, TunerFrontendInfo* _aidl_return) {

    if (mTuner == nullptr) {

        ALOGE("ITuner service is not init.");

        return ::ndk::ScopedAStatus::fromServiceSpecificError(
@@ -239,7 +239,7 @@ Status TunerService::getFrontendInfo( 
        return Status::fromServiceSpecificError(static_cast<int32_t>(res));

    }



    TunerServiceFrontendInfo tunerInfo = convertToAidlFrontendInfo(feId, info);

    TunerFrontendInfo tunerInfo = convertToAidlFrontendInfo(info);

    *_aidl_return = tunerInfo;

    return Status::ok();

}
@@ -257,9 +257,8 @@ Status TunerService::openFrontend( 
    return Status::ok();

}



TunerServiceFrontendInfo TunerService::convertToAidlFrontendInfo(int feId, FrontendInfo halInfo) {

    TunerServiceFrontendInfo info{

        .id = feId,

TunerFrontendInfo TunerService::convertToAidlFrontendInfo(FrontendInfo halInfo) {

    TunerFrontendInfo info{

        .type = (int)halInfo.type,

        .minFrequency = (int)halInfo.minFrequency,

        .maxFrequency = (int)halInfo.maxFrequency,

services/tuner/TunerService.h

+3 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define ANDROID_MEDIA_TUNERSERVICE_H



#include <aidl/android/media/tv/tuner/BnTunerService.h>

#include <aidl/android/media/tv/tuner/TunerServiceFrontendInfo.h>

#include <android/hardware/tv/tuner/1.0/ITuner.h>

#include <fmq/AidlMessageQueue.h>

#include <fmq/EventFlag.h>
@@ -29,7 +28,7 @@ using ::aidl::android::hardware::common::fmq::MQDescriptor; 
using ::aidl::android::hardware::common::fmq::SynchronizedReadWrite;

using ::aidl::android::media::tv::tuner::BnTunerService;

using ::aidl::android::media::tv::tuner::ITunerFrontend;

using ::aidl::android::media::tv::tuner::TunerServiceFrontendInfo;

using ::aidl::android::media::tv::tuner::TunerFrontendInfo;



using ::android::hardware::details::logError;

using ::android::hardware::EventFlag;
@@ -86,7 +85,7 @@ public: 
    }



    Status getFrontendIds(std::vector<int32_t>* ids, int32_t* _aidl_return) override;

    Status getFrontendInfo(int32_t frontendHandle, TunerServiceFrontendInfo* _aidl_return) override;

    Status getFrontendInfo(int32_t frontendHandle, TunerFrontendInfo* _aidl_return) override;

    Status openFrontend(

            int32_t frontendHandle, std::shared_ptr<ITunerFrontend>* _aidl_return) override;

    Status getFmqSyncReadWrite(
@@ -110,7 +109,7 @@ private: 
    MQDescriptorSync<uint8_t> mFilterMQDesc;

    AidlMQDesc mAidlMQDesc;

    EventFlag* mEventFlag;

    TunerServiceFrontendInfo convertToAidlFrontendInfo(int feId, FrontendInfo halInfo);

    TunerFrontendInfo convertToAidlFrontendInfo(FrontendInfo halInfo);

};



} // namespace android

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

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.media.tv.tuner; 
import android.media.tv.tuner.ITunerFrontendCallback;

import android.media.tv.tuner.TunerFrontendSettings;

import android.media.tv.tuner.TunerFrontendStatus;

import android.media.tv.tuner.TunerServiceFrontendInfo;



/**

 * Tuner Frontend interface handles tuner related operations.

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

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.hardware.common.fmq.MQDescriptor; 
import android.hardware.common.fmq.SynchronizedReadWrite;

import android.hardware.common.fmq.UnsynchronizedWrite;

import android.media.tv.tuner.ITunerFrontend;

import android.media.tv.tuner.TunerServiceFrontendInfo;

import android.media.tv.tuner.TunerFrontendInfo;



/**

 * TunerService interface handles tuner related operations.
@@ -43,7 +43,7 @@ interface ITunerService { 
     * @param frontendHandle the handle of the frontend granted by TRM.

     * @return the information of the frontend.

     */

    TunerServiceFrontendInfo getFrontendInfo(in int frontendHandle);

    TunerFrontendInfo getFrontendInfo(in int frontendHandle);



    /**

     * Open a Tuner Frontend interface.