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

Commit b05f06de authored by Amy Zhang's avatar Amy Zhang
Browse files

Complete Frontend Status aidl interface and getStatus API in 

TunerFrontend

Test: make
Bug: 159067322
Change-Id: Ifc3aea59ae10d22c7f31965f07705f473d4847e7
parent b20005c0

services/tuner/TunerFilter.cpp

+3 −6
Original line number Diff line number Diff line
@@ -311,12 +311,9 @@ DemuxFilterSectionSettings TunerFilter::getSectionSettings(const TunerFilterSett 
    switch (s.condition.getTag()) {

        case TunerFilterSectionCondition::sectionBits: {

            auto sectionBits = s.condition.get<TunerFilterSectionCondition::sectionBits>();

            vector<uint8_t> filter(sectionBits.filter.size());

            vector<uint8_t> mask(sectionBits.mask.size());

            vector<uint8_t> mode(sectionBits.mode.size());

            copy(sectionBits.filter.begin(), sectionBits.filter.end(), filter.begin());

            copy(sectionBits.mask.begin(), sectionBits.mask.end(), mask.begin());

            copy(sectionBits.mode.begin(), sectionBits.mode.end(), mode.begin());

            vector<uint8_t> filter(sectionBits.filter.begin(), sectionBits.filter.end());

            vector<uint8_t> mask(sectionBits.mask.begin(), sectionBits.mask.end());

            vector<uint8_t> mode(sectionBits.mode.begin(), sectionBits.mode.end());

            section.condition.sectionBits({

                .filter = filter,

                .mask = mask,

services/tuner/TunerFrontend.cpp

+395 −4

File changed.

Preview size limit exceeded, changes collapsed.

services/tuner/TunerFrontend.h

+8 −0
Original line number Diff line number Diff line
@@ -42,11 +42,13 @@ using ::android::hardware::tv::tuner::V1_0::FrontendId; 
using ::android::hardware::tv::tuner::V1_0::FrontendScanMessage;

using ::android::hardware::tv::tuner::V1_0::FrontendScanMessageType;

using ::android::hardware::tv::tuner::V1_0::FrontendSettings;

using ::android::hardware::tv::tuner::V1_0::FrontendStatus;

using ::android::hardware::tv::tuner::V1_0::IFrontend;

using ::android::hardware::tv::tuner::V1_1::IFrontendCallback;

using ::android::hardware::tv::tuner::V1_1::FrontendScanMessageExt1_1;

using ::android::hardware::tv::tuner::V1_1::FrontendScanMessageTypeExt1_1;

using ::android::hardware::tv::tuner::V1_1::FrontendSettingsExt1_1;

using ::android::hardware::tv::tuner::V1_1::FrontendStatusExt1_1;



using namespace std;
@@ -68,6 +70,8 @@ public: 
    Status close() override;

    Status getStatus(const vector<int32_t>& statusTypes,

            vector<TunerFrontendStatus>* _aidl_return) override;

    Status getStatusExtended_1_1(const vector<int32_t>& statusTypes,

            vector<TunerFrontendStatus>* _aidl_return) override;

    Status getFrontendId(int* _aidl_return) override;



    struct FrontendCallback : public IFrontendCallback {
@@ -89,6 +93,10 @@ private: 
    FrontendDvbsCodeRate getDvbsCodeRate(const TunerFrontendDvbsCodeRate& codeRate);

    FrontendSettings getHidlFrontendSettings(const TunerFrontendSettings& aidlSettings);

    FrontendSettingsExt1_1 getHidlFrontendSettingsExt(const TunerFrontendSettings& aidlSettings);

    void getAidlFrontendStatus(

            vector<FrontendStatus>& hidlStatus, vector<TunerFrontendStatus>& aidlStatus);

    void getAidlFrontendStatusExt(

            vector<FrontendStatusExt1_1>& hidlStatus, vector<TunerFrontendStatus>& aidlStatus);



    int mId;

    sp<IFrontend> mFrontend;

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

+5 −0
Original line number Diff line number Diff line
@@ -82,6 +82,11 @@ interface ITunerFrontend { 
     */

    TunerFrontendStatus[] getStatus(in int[] statusTypes);



    /**

     * Gets the 1.1 extended statuses of the frontend.

     */

    TunerFrontendStatus[] getStatusExtended_1_1(in int[] statusTypes);



    /**

     * Gets the id of the frontend.

     */

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ package android.media.tv.tuner; 
 * {@hide}

 */

parcelable TunerFrontendScanAtsc3PlpInfo {

    int plpId;

    byte plpId;



    boolean llsFlag;

}