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

Commit 4b1321e4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing code style for changes added to expand Tuner HAL VTS Dyanmic Configuration"

parents c616bc7f 01dca3d6

tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h

+31 −39
Original line number Diff line number Diff line
@@ -286,8 +286,7 @@ struct TunerTestingConfigAidlReader1_0 { 
                    }

                    case FrontendTypeEnum::ISDBS:

                        type = FrontendType::ISDBS;

                        frontendMap[id].settings.set<

                            FrontendSettings::Tag::isdbs>(

                        frontendMap[id].settings.set<FrontendSettings::Tag::isdbs>(

                                readIsdbsFrontendSettings(feConfig));

                        break;

                    case FrontendTypeEnum::ISDBS3:
@@ -710,18 +709,14 @@ struct TunerTestingConfigAidlReader1_0 { 
            return atscSettings;

        }

        auto atsc = feConfig.getFirstAtscFrontendSettings_optional();

      atscSettings.inversion = static_cast<FrontendSpectralInversion>(

          atsc->getInversion());

      atscSettings.modulation = static_cast<FrontendAtscModulation>(

          atsc->getModulation());

        atscSettings.inversion = static_cast<FrontendSpectralInversion>(atsc->getInversion());

        atscSettings.modulation = static_cast<FrontendAtscModulation>(atsc->getModulation());

        return atscSettings;

    }



    static FrontendIsdbsSettings readIsdbsFrontendSettings(Frontend& feConfig) {

        ALOGW("[ConfigReader] fe type is isdbs");

      FrontendIsdbsSettings isdbsSettings{

              .frequency = (int64_t)feConfig.getFrequency()

      };

        FrontendIsdbsSettings isdbsSettings{.frequency = (int64_t)feConfig.getFrequency()};

        if (feConfig.hasEndFrequency()) {

            isdbsSettings.endFrequency = (int64_t)feConfig.getEndFrequency();

        }
@@ -732,14 +727,11 @@ struct TunerTestingConfigAidlReader1_0 { 
        auto isdbs = feConfig.getFirstIsdbsFrontendSettings_optional();

        isdbsSettings.streamId = (int32_t)isdbs->getStreamId();

        isdbsSettings.symbolRate = (int32_t)isdbs->getSymbolRate();

      isdbsSettings.modulation = static_cast<FrontendIsdbsModulation>(

          isdbs->getModulation());

      isdbsSettings.coderate = static_cast<FrontendIsdbsCoderate>(

          isdbs->getCoderate());

      isdbsSettings.rolloff = static_cast<FrontendIsdbsRolloff>(

          isdbs->getRolloff());

      isdbsSettings.streamIdType = static_cast<FrontendIsdbsStreamIdType>(

          isdbs->getStreamIdType());

        isdbsSettings.modulation = static_cast<FrontendIsdbsModulation>(isdbs->getModulation());

        isdbsSettings.coderate = static_cast<FrontendIsdbsCoderate>(isdbs->getCoderate());

        isdbsSettings.rolloff = static_cast<FrontendIsdbsRolloff>(isdbs->getRolloff());

        isdbsSettings.streamIdType =

                static_cast<FrontendIsdbsStreamIdType>(isdbs->getStreamIdType());

        return isdbsSettings;

    }