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

Commit 01dca3d6 authored by Frankie Lizcano's avatar Frankie Lizcano
Browse files

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

Bug: b/237319139

Test: Ran locally and confirmed changes

Change-Id: I37fee9a84a7885501912e151b7feeb4fe273a14f
parent 452b026f

tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h

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

                    }

                    case FrontendTypeEnum::ISDBS:

                    case FrontendTypeEnum::ISDBS:

                        type = FrontendType::ISDBS;

                        type = FrontendType::ISDBS;

                        frontendMap[id].settings.set<

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

                            FrontendSettings::Tag::isdbs>(

                                readIsdbsFrontendSettings(feConfig));

                                readIsdbsFrontendSettings(feConfig));

                        break;

                        break;

                    case FrontendTypeEnum::ISDBS3:

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

            return atscSettings;

        }

        }

        auto atsc = feConfig.getFirstAtscFrontendSettings_optional();

        auto atsc = feConfig.getFirstAtscFrontendSettings_optional();

      atscSettings.inversion = static_cast<FrontendSpectralInversion>(

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

          atsc->getInversion());

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

      atscSettings.modulation = static_cast<FrontendAtscModulation>(

          atsc->getModulation());

        return atscSettings;

        return atscSettings;

    }

    }





    static FrontendIsdbsSettings readIsdbsFrontendSettings(Frontend& feConfig) {

    static FrontendIsdbsSettings readIsdbsFrontendSettings(Frontend& feConfig) {

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

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

      FrontendIsdbsSettings isdbsSettings{

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

              .frequency = (int64_t)feConfig.getFrequency()

      };

        if (feConfig.hasEndFrequency()) {

        if (feConfig.hasEndFrequency()) {

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

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

        }

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

        auto isdbs = feConfig.getFirstIsdbsFrontendSettings_optional();

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

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

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

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

      isdbsSettings.modulation = static_cast<FrontendIsdbsModulation>(

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

          isdbs->getModulation());

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

      isdbsSettings.coderate = static_cast<FrontendIsdbsCoderate>(

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

          isdbs->getCoderate());

        isdbsSettings.streamIdType =

      isdbsSettings.rolloff = static_cast<FrontendIsdbsRolloff>(

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

          isdbs->getRolloff());

      isdbsSettings.streamIdType = static_cast<FrontendIsdbsStreamIdType>(

          isdbs->getStreamIdType());

        return isdbsSettings;

        return isdbsSettings;

    }

    }