Clear StreamPlayers when doing global file operations

Summary: In global filter/copy operations, we better make sure that there isn't any previously registered StreamPlayer that would be unrelated.

Reviewed By: kiminoue7

Differential Revision: D51573459

fbshipit-source-id: d988e7f2d8b656601b871eeae073f86ece71d7c5

vrs/RecordFileReader.cpp

@@ -464,9 +464,6 @@ int RecordFileReader::closeFile() {
 }
 
 int RecordFileReader::clearStreamPlayers() {
-  if (file_->isOpened()) {
-    return INVALID_REQUEST;
-  }
   streamPlayers_.clear();
   return 0;
 }

vrs/RecordFileReader.h

@@ -115,8 +115,7 @@ class RecordFileReader {
   void setStreamPlayer(StreamId streamId, StreamPlayer* streamPlayer);
 
   /// Remove all registered stream players.
-  /// @return O on success, or an error if the file isn't closed, and stream players were not
-  /// removed.
+  /// @return O on success.
   int clearStreamPlayers();
 
   /// When streaming a VRS file from the cloud, it may be very beneficial to tell before hand which

vrs/utils/AudioTrackExtractor.cpp

@@ -245,6 +245,7 @@ string extractAudioTrack(FilteredFileReader& filteredReader, const std::string&
       return failure(doc, jsonFilePath);
     }
   }
+  filteredReader.reader.clearStreamPlayers();
   bool stop = false;
   unique_ptr<AudioTrackExtractor> audioExtractor;
   StreamId streamId;

vrs/utils/FilterCopy.cpp

@@ -77,6 +77,7 @@ int filterCopy(
   ThrottledWriter throttledWriter(copyOptions, *throttledFileDelegate);
   RecordFileWriter& writer = throttledWriter.getWriter();
   writer.addTags(filteredReader.reader.getTags());
+  filteredReader.reader.clearStreamPlayers();
   vector<unique_ptr<StreamPlayer>> filters;
   filters.reserve(filteredReader.filter.streams.size());
   {
@@ -196,6 +197,7 @@ int filterMerge(
   // setup the record file writer and hook-up the readers to record copiers, and copy/merge tags
   ThrottledWriter throttledWriter(copyOptions, *throttledFileDelegate);
   RecordFileWriter& recordFileWriter = throttledWriter.getWriter();
+  firstRecordFilter.reader.clearStreamPlayers();
   list<NoDuplicateCopier> copiers; // to delete copiers on exit
   // track copiers by recordable type id in sequence/instance order in the output file
   map<RecordableTypeId, vector<NoDuplicateCopier*>> copiersMap;
@@ -210,6 +212,7 @@ int filterMerge(
   firstRecordFilter.getTimeRange(startTimestamp, endTimestamp);
   for (auto* recordFilter : moreRecordFilters) {
     RecordFileReader& reader = recordFilter->reader;
+    reader.clearStreamPlayers();
     recordFilter->expandTimeRange(startTimestamp, endTimestamp);
     // add the global tags
     map<string, string> tags;

vrs/utils/FilteredFileReader.cpp

@@ -623,9 +623,7 @@ uint32_t FilteredFileReader::iterateAdvanced(ThrottledWriter* throttledWriter) {
         return true;
       },
       throttledWriter);
-  for (auto id : filter.streams) {
-    reader.setStreamPlayer(id, nullptr);
-  }
+  reader.clearStreamPlayers();
   return readCounter;
 }
 

vrs/utils/Validation.cpp

@@ -179,9 +179,7 @@ bool iterateChecker(
         return outNoError;
       },
       throttledWriter);
-  for (auto id : reader.filter.streams) {
-    reader.reader.setStreamPlayer(id, nullptr);
-  }
+  reader.reader.clearStreamPlayers();
   outDuration = os::getTimestampSec() - beforeTime;
   return true;
 }
@@ -295,6 +293,7 @@ class DecodeChecker : public VideoRecordFormatStreamPlayer {
 string decodeValidation(FilteredFileReader& filteredReader, const CopyOptions& copyOptions) {
   uint32_t decodeErrorCount{0};
   uint32_t imageCount{0};
+  filteredReader.reader.clearStreamPlayers();
   vector<unique_ptr<DecodeChecker>> checkers;
   for (auto id : filteredReader.filter.streams) {
     checkers.emplace_back(make_unique<DecodeChecker>(decodeErrorCount, imageCount));
@@ -350,6 +349,7 @@ string checkRecords(
   if (!filteredReader.reader.isOpened()) {
     return {};
   }
+  filteredReader.reader.clearStreamPlayers();
   if (checkType == CheckType::Decode) {
     return decodeValidation(filteredReader, copyOptions);
   }
@@ -770,6 +770,8 @@ bool compareVRSfiles(
   if (!match) {
     return false;
   }
+  first.reader.clearStreamPlayers();
+  second.reader.clearStreamPlayers();
   atomic<int> diffCounter{0};
   bool noError;
   vector<unique_ptr<RecordHolder>> holders;

vrs/utils/cli/DataExtraction.cpp

@@ -45,6 +45,7 @@ void extractImages(
     imageNamer = &defaultImageNamer;
   }
   imageNamer->init(filteredReader.reader);
+  filteredReader.reader.clearStreamPlayers();
   uint32_t imageCounter = 0;
   deque<unique_ptr<StreamPlayer>> extractors;
   for (auto id : filteredReader.filter.streams) {
@@ -73,6 +74,7 @@ int extractAudio(const string& path, FilteredFileReader& filteredReader) {
       return FAILURE;
     }
   }
+  filteredReader.reader.clearStreamPlayers();
   uint32_t audioFileCount = 0;
   uint32_t streamCount = 0;
   deque<unique_ptr<StreamPlayer>> extractors;

vrs/utils/cli/ListRecords.cpp

@@ -59,6 +59,7 @@ class RecordLister : public StreamPlayer {
 namespace vrs::utils {
 
 void listRecords(utils::FilteredFileReader& filteredReader) {
+  filteredReader.reader.clearStreamPlayers();
   RecordLister lister;
   for (auto id : filteredReader.filter.streams) {
     filteredReader.reader.setStreamPlayer(id, &lister);

vrs/utils/cli/PrintRecordFormatRecords.cpp

@@ -191,6 +191,7 @@ class DataLayoutPrinter : public RecordFormatStreamPlayer {
 namespace vrs::utils {
 
 void printRecordFormatRecords(FilteredFileReader& filteredReader, PrintoutType type) {
+  filteredReader.reader.clearStreamPlayers();
   DataLayoutPrinter lister(type);
   for (auto id : filteredReader.filter.streams) {
     filteredReader.reader.setStreamPlayer(id, &lister);