Support multiple media tracks in MSE / ChunkDemuxer

media/filters/frame_processor.h

 // Copyright 2014 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_FRAME_PROCESSOR_H_
 #define MEDIA_FILTERS_FRAME_PROCESSOR_H_
 
 #include <map>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
 #include "media/base/stream_parser.h"
 #include "media/filters/chunk_demuxer.h"
 
 namespace media {
 
 class MseTrackBuffer;
 
 // Helper class that implements Media Source Extension's coded frame processing
 // algorithm.
 class MEDIA_EXPORT FrameProcessor {
  public:
   typedef base::Callback<void(base::TimeDelta)> UpdateDurationCB;
 
-  // TODO(wolenetz/acolwell): Ensure that all TrackIds are coherent and unique
-  // for each track buffer. For now, special track identifiers are used for each
-  // of audio and video here, and text TrackIds are assumed to be non-negative.
-  // See http://crbug.com/341581.
-  enum {
-    kAudioTrackId = -2,
-    kVideoTrackId = -3
-  };
-
   FrameProcessor(const UpdateDurationCB& update_duration_cb,
                  const scoped_refptr<MediaLog>& media_log);
   ~FrameProcessor();
 
   // Get/set the current append mode, which if true means "sequence" and if
   // false means "segments".
   // See http://www.w3.org/TR/media-source/#widl-SourceBuffer-mode.
   bool sequence_mode() { return sequence_mode_; }
   void SetSequenceMode(bool sequence_mode);
 
@@ skipping 133 matching lines @@
   // Counters that limit spam to |media_log_| for frame processor warnings.
   int num_dropped_preroll_warnings_ = 0;
   int num_dts_beyond_pts_warnings_ = 0;
 
   DISALLOW_COPY_AND_ASSIGN(FrameProcessor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FRAME_PROCESSOR_H_