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

Commit 7e20b993 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Complete Frontend Status aidl interface and getStatus API in TunerFrontend" into sc-dev

parents cae5cfee b05f06de

services/tuner/TunerFilter.cpp

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

    switch (s.condition.getTag()) {

        case TunerFilterSectionCondition::sectionBits: {

        case TunerFilterSectionCondition::sectionBits: {

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

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

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

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

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

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

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

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

            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());

            section.condition.sectionBits({

            section.condition.sectionBits({

                .filter = filter,

                .filter = filter,

                .mask = mask,

                .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 Original line 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::FrontendScanMessage;

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

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

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

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_0::IFrontend;

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

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

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

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::FrontendScanMessageTypeExt1_1;

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

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

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





using namespace std;

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

    Status close() override;

    Status getStatus(const vector<int32_t>& statusTypes,

    Status getStatus(const vector<int32_t>& statusTypes,

            vector<TunerFrontendStatus>* _aidl_return) override;

            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;

    Status getFrontendId(int* _aidl_return) override;





    struct FrontendCallback : public IFrontendCallback {

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

    FrontendDvbsCodeRate getDvbsCodeRate(const TunerFrontendDvbsCodeRate& codeRate);

    FrontendSettings getHidlFrontendSettings(const TunerFrontendSettings& aidlSettings);

    FrontendSettings getHidlFrontendSettings(const TunerFrontendSettings& aidlSettings);

    FrontendSettingsExt1_1 getHidlFrontendSettingsExt(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;

    int mId;

    sp<IFrontend> mFrontend;

    sp<IFrontend> mFrontend;

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

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

     */

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

    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.

     * Gets the id of the frontend.

     */

     */

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

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

 * {@hide}

 */

 */

parcelable TunerFrontendScanAtsc3PlpInfo {

parcelable TunerFrontendScanAtsc3PlpInfo {

    int plpId;

    byte plpId;





    boolean llsFlag;

    boolean llsFlag;

}
 
}