MSE: Pick frame processor in ChunkDemuxer::AddId; prepare unit tests to pick processor

media/filters/chunk_demuxer.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
 
 #include <deque>
 #include <map>
 #include <string>
@@ skipping 168 matching lines @@
   // StartWaitingForSeek() call. This method also arranges for the next Seek()
   // call received before a StartWaitingForSeek() call to immediately call its
   // callback without waiting for any data.
   // |seek_time| - The presentation timestamp for the seek request that
   // triggered this call. It represents the most recent position the caller is
   // trying to seek to.
   void CancelPendingSeek(base::TimeDelta seek_time);
 
   // Registers a new |id| to use for AppendData() calls. |type| indicates
   // the MIME type for the data that we intend to append for this ID.
+  // |use_legacy_frame_processor| determines which of LegacyFrameProcessor or
+  // a (not yet implemented) more compliant frame processor to use to process
+  // parsed frames from AppendData() calls.
+  // TODO(wolenetz): Enable usage of new frame processor based on this flag.
+  // See http://crbug.com/249422.
   // kOk is returned if the demuxer has enough resources to support another ID
   //    and supports the format indicated by |type|.
   // kNotSupported is returned if |type| is not a supported format.
   // kReachedIdLimit is returned if the demuxer cannot handle another ID right
   //    now.
   Status AddId(const std::string& id, const std::string& type,
-               std::vector<std::string>& codecs);
+               std::vector<std::string>& codecs,
+               const bool use_legacy_frame_processor);
 
   // Removed an ID & associated resources that were previously added with
   // AddId().
   void RemoveId(const std::string& id);
 
   // Gets the currently buffered ranges for the specified ID.
   Ranges<base::TimeDelta> GetBufferedRanges(const std::string& id) const;
 
   // Appends media data to the source buffer associated with |id|, applying
   // and possibly updating |*timestamp_offset| during coded frame processing.
@@ skipping 76 matching lines @@
   // SourceState callbacks.
   void OnSourceInitDone(bool success, base::TimeDelta duration);
 
   // Creates a DemuxerStream for the specified |type|.
   // Returns a new ChunkDemuxerStream instance if a stream of this type
   // has not been created before. Returns NULL otherwise.
   ChunkDemuxerStream* CreateDemuxerStream(DemuxerStream::Type type);
 
   void OnNewTextTrack(ChunkDemuxerStream* text_stream,
                       const TextTrackConfig& config);
-  void OnNewMediaSegment(const std::string& source_id,
-                         base::TimeDelta start_timestamp);
 
   // Returns true if |source_id| is valid, false otherwise.
   bool IsValidId(const std::string& source_id) const;
 
   // Increases |duration_| to |new_duration|, if |new_duration| is higher.
   void IncreaseDurationIfNecessary(base::TimeDelta new_duration);
 
   // Decreases |duration_| if the buffered region is less than |duration_| when
   // EndOfStream() is called.
   void DecreaseDurationIfNecessary();
@@ skipping 66 matching lines @@
 
   // Indicates that splice frame generation is enabled.
   const bool splice_frames_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_