feat!(filter-program): improve filter-program

BREAKING CHANGES:
* filter-program doesn't use ServiceFilter
* keep last PAT/PMT packets and send them before streaming
* the pre-streaming option only send PAT packets
* remove filter-program2

CMakeLists.txt

@@ -551,7 +551,6 @@ add_executable(mirakc-arib
   src/packet_source.hh
   src/pcr_synchronizer.hh
   src/program_filter.hh
-  src/program_filter2.hh
   src/service_filter.hh
   src/service_scanner.hh
 )
@@ -590,7 +589,6 @@ if(MIRAKC_ARIB_TEST)
     test/packet_source_test.cc
     test/pcr_synchronizer_test.cc
     test/program_filter_test.cc
-    test/program_filter2_test.cc
     test/service_filter_test.cc
     test/service_scanner_test.cc
     test/test.cc

src/main.cc

@@ -19,7 +19,6 @@
 #include "packet_source.hh"
 #include "pcr_synchronizer.hh"
 #include "program_filter.hh"
-#include "program_filter2.hh"
 #include "service_filter.hh"
 #include "service_scanner.hh"
 
@@ -42,7 +41,7 @@ Tools to process ARIB TS streams.
 Usage:
   mirakc-arib (-h | --help) [(scan-services | sync-clocks | collect-eits |
                               collect-logos | filter-service | filter-program |
-                              filter-program2 | track-airtime)]
+                              track-airtime)]
   mirakc-arib --version
   mirakc-arib scan-services [--sids=<SID>...] [--xsids=<SID>...] [FILE]
   mirakc-arib sync-clocks [--sids=<SID>...] [--xsids=<SID>...] [FILE]
@@ -53,7 +52,6 @@ Tools to process ARIB TS streams.
   mirakc-arib filter-program --sid=<SID> --eid=<EID>
               --clock-pcr=<PCR> --clock-time=<UNIX-TIME-MS>
               [--start-margin=<MS>] [--end-margin=<MS>] [--pre-streaming] [FILE]
-  mirakc-arib filter-program2 --sid=<SID> --eid=<EID> [FILE]
   mirakc-arib track-airtime --sid=<SID> --eid=<EID> [FILE]
 
 Description:
@@ -443,19 +441,19 @@ Program filter
     Offset (ms) from the end time of the event toward the future.
 
   --pre-streaming
-    Output PSI/SI packets before start.
+    Output PAT packets before start.
 
 Arguments:
   FILE
     Path to a TS file.
 
 Description:
-  `filter-program` performs the same processing as `filter-service`, but also
-  outputs packets only while a specified TV program is being broadcast.
+  `filter-program` outputs packets only while a specified TV program is being
+  broadcasted.
 
-  Unlike Mirakurun, `filter-program` calculates the start and end times of
-  streaming based on PCR.  The `--start-margin` and `--end-margin` adjust these
-  times like below:
+  Unlike Mirakurun, `filter-program` determines the start and end times of the
+  TV program by using PCR values synchronized with TDT/TOT.  The
+  `--start-margin` and `--end-margin` adjust these times like below:
 
           start-margin                         end-margin
     ----|<============|-----------------------|==========>|----
@@ -464,38 +462,6 @@ Program filter
       of streaming  of the TV program  of the TV program  of streaming
 )";
 
-static const std::string kFilterProgram2 = "filter-program2";
-
-static const std::string kFilterProgram2Help = R"(
-Program filter
-
-Usage:
-  mirakc-arib filter-program2 --sid=<SID> --eid=<EID> [FILE]
-
-Options:
-  -h --help
-    Print help.
-
-  --sid=<SID>
-    Service ID.
-
-  --eid=<EID>
-    Event ID of a TV program.
-
-Arguments:
-  FILE
-    Path to a TS file.
-
-Description:
-  Unkile `filter-program`, `filter-program2` doesn't use PCR for detecting the
-  start position of the TV program.  Instead, `filter-program2` detects the
-  change of the PMT version as the start position of the TV program.
-
-  Before the TV program starts, PMTs for the previous TV program will come.
-  `filter-program2` simply drops PMT and PES packets until a different version
-  of PMT comes.  This is not a perfect solution, but works well in most cases.
-)";
-
 static const std::string kTrackAirtime = "track-airtime";
 
 static const std::string kTrackAirtimeHelp = R"(
@@ -585,8 +551,6 @@ void Init(const Args& args) {
     InitLogger(kFilterService);
   } else if (args.at(kFilterProgram).asBool()) {
     InitLogger(kFilterProgram);
-  } else if (args.at(kFilterProgram2).asBool()) {
-    InitLogger(kFilterProgram2);
   } else if (args.at(kTrackAirtime).asBool()) {
     InitLogger(kTrackAirtime);
   }
@@ -679,16 +643,6 @@ void LoadOption(const Args& args, ProgramFilterOption* opt) {
       opt->end_margin, opt->pre_streaming);
 }
 
-void LoadOption(const Args& args, ProgramFilter2Option* opt) {
-  static const std::string kSid = "--sid";
-  static const std::string kEid = "--eid";
-
-  opt->sid = static_cast<uint16_t>(args.at(kSid).asLong());
-  opt->eid = static_cast<uint16_t>(args.at(kEid).asLong());
-  MIRAKC_ARIB_INFO(
-      "Program Filter 2: SID#{:04X} EID#{:04X}", opt->sid, opt->eid);
-}
-
 std::unique_ptr<PacketSink> MakePacketSink(const Args& args) {
   if (args.at(kScanServices).asBool()) {
     ServiceScannerOption option;
@@ -726,25 +680,10 @@ std::unique_ptr<PacketSink> MakePacketSink(const Args& args) {
     return filter;
   }
   if (args.at(kFilterProgram).asBool()) {
-    ServiceFilterOption service_option;
-    LoadOption(args, &service_option);
-    auto filter = std::make_unique<ServiceFilter>(service_option);
     ProgramFilterOption program_option;
     LoadOption(args, &program_option);
-    auto program_filter = std::make_unique<ProgramFilter>(program_option);
-    program_filter->Connect(std::make_unique<StdoutSink>());
-    filter->Connect(std::move(program_filter));
-    return filter;
-  }
-  if (args.at(kFilterProgram2).asBool()) {
-    ServiceFilterOption service_option;
-    LoadOption(args, &service_option);
-    auto filter = std::make_unique<ServiceFilter>(service_option);
-    ProgramFilter2Option program_option;
-    LoadOption(args, &program_option);
-    auto program_filter = std::make_unique<ProgramFilter2>(program_option);
-    program_filter->Connect(std::make_unique<StdoutSink>());
-    filter->Connect(std::move(program_filter));
+    auto filter = std::make_unique<ProgramFilter>(program_option);
+    filter->Connect(std::make_unique<StdoutSink>());
     return filter;
   }
   if (args.at(kTrackAirtime).asBool()) {
@@ -770,8 +709,6 @@ void ShowHelp(const Args& args) {
     fmt::print(kFilterServiceHelp);
   } else if (args.at(kFilterProgram).asBool()) {
     fmt::print(kFilterProgramHelp);
-  } else if (args.at(kFilterProgram2).asBool()) {
-    fmt::print(kFilterProgram2Help);
   } else if (args.at(kTrackAirtime).asBool()) {
     fmt::print(kTrackAirtimeHelp);
   } else {