Fixed track id remapping in MSE FrameProcessor

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 <memory>
 
@@ skipping 40 matching lines @@
   // Signals the frame processor to update its group start timestamp to be
   // |timestamp_offset| if it is in sequence append mode.
   void SetGroupStartTimestampIfInSequenceMode(base::TimeDelta timestamp_offset);
 
   // Adds a new track with unique track ID |id|.
   // If |id| has previously been added, returns false to indicate error.
   // Otherwise, returns true, indicating future ProcessFrames() will emit
   // frames for the track |id| to |stream|.
   bool AddTrack(StreamParser::TrackId id, ChunkDemuxerStream* stream);
 
-  // Updates the internal mapping of TrackId to track buffer for the track
-  // buffer formerly associated with |old_id| to be associated with |new_id|.
-  // Returns false to indicate failure due to either no existing track buffer
-  // for |old_id| or collision with previous track buffer already mapped to
-  // |new_id|. Otherwise returns true.
-  bool UpdateTrack(StreamParser::TrackId old_id, StreamParser::TrackId new_id);
+  // A map that describes how track ids changed between init segment. Maps the
+  // old track id for a new track id for the same track.
+  using TrackIdChanges = std::map<StreamParser::TrackId, StreamParser::TrackId>;
+
+  // Updates the internal mapping of TrackIds to track buffers. The input
+  // parameter |track_id_changes| maps old track ids to new ones. The track ids
+  // not present in the map must be assumed unchanged. Returns false if
+  // remapping failed.
+  bool UpdateTrackIds(const TrackIdChanges& track_id_changes);
 
   // Sets the need random access point flag on all track buffers to true.
   void SetAllTrackBuffersNeedRandomAccessPoint();
 
   // Resets state for the coded frame processing algorithm as described in steps
   // 2-5 of the MSE Reset Parser State algorithm described at
   // http://www.w3.org/TR/media-source/#sourcebuffer-reset-parser-state
   void Reset();
 
   // Must be called when the audio config is updated.  Used to manage when
@@ skipping 39 matching lines @@
       const scoped_refptr<StreamParserBuffer>& buffer);
 
   // Helper that processes one frame with the coded frame processing algorithm.
   // Returns false on error or true on success.
   bool ProcessFrame(const scoped_refptr<StreamParserBuffer>& frame,
                     base::TimeDelta append_window_start,
                     base::TimeDelta append_window_end,
                     base::TimeDelta* timestamp_offset);
 
   // TrackId-indexed map of each track's stream.
-  std::map<StreamParser::TrackId, std::unique_ptr<MseTrackBuffer>>
-      track_buffers_;
+  using TrackBuffersMap =
+      std::map<StreamParser::TrackId, std::unique_ptr<MseTrackBuffer>>;
+  TrackBuffersMap track_buffers_;
 
   // The last audio buffer seen by the frame processor that was removed because
   // it was entirely before the start of the append window.
   scoped_refptr<StreamParserBuffer> audio_preroll_buffer_;
 
   // The AudioDecoderConfig associated with buffers handed to ProcessFrames().
   AudioDecoderConfig current_audio_config_;
   base::TimeDelta sample_duration_;
 
   // The AppendMode of the associated SourceBuffer.
@@ skipping 33 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_