commit ce1e30d578e43a0016017bb1ea162acb715525f8
author Hongguang <hgchen@google.com> Mon Aug 02 21:55:44 2021 -0700
committer Hongguang <hgchen@google.com> Tue Aug 03 08:57:32 2021 -0700
tree 0cfe6187ee90e4f22a6f3bcd590da83fe38c3853
parent e24a0dce53f96b6f369cb851337cec2807c9440d

Update tuner default implementation and VTS.

*) DemuxFilterTypeDemuxFilterSubType -> DemuxFilterSubType.

Bug: 191825295
Test: make and run VtsHalTvTunerTargetTest
Change-Id: I9069ff91d35b58ee1db4297f888ef241cdfbc135

tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h

diff --git a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h
index 1ddb641..b4fb54f 100644
--- a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h
+++ b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h
@@ -119,9 +119,8 @@
     string defaultVideoFilterId = "FILTER_VIDEO_DEFAULT";
 
     filterMap[defaultVideoFilterId].type.mainType = DemuxFilterMainType::TS;
-    filterMap[defaultVideoFilterId]
-            .type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
-                    DemuxTsFilterType::VIDEO);
+    filterMap[defaultVideoFilterId].type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
+            DemuxTsFilterType::VIDEO);
     filterMap[defaultVideoFilterId].bufferSize = FMQ_SIZE_16M;
     filterMap[defaultVideoFilterId].settings =
             DemuxFilterSettings::make<DemuxFilterSettings::Tag::ts>();
@@ -138,9 +137,8 @@
             VideoStreamType::MPEG1);
 
     filterMap[defaultAudioFilterId].type.mainType = DemuxFilterMainType::TS;
-    filterMap[defaultAudioFilterId]
-            .type.subType.set<DemuxFilterTypeDemuxFilterSubType::Tag::tsFilterType>(
-                    DemuxTsFilterType::AUDIO);
+    filterMap[defaultAudioFilterId].type.subType.set<DemuxFilterSubType::Tag::tsFilterType>(
+            DemuxTsFilterType::AUDIO);
     filterMap[defaultAudioFilterId].bufferSize = FMQ_SIZE_16M;
     filterMap[defaultAudioFilterId].settings =
             DemuxFilterSettings::make<DemuxFilterSettings::Tag::ts>();