Support multiple media tracks in MSE / ChunkDemuxer

media/filters/frame_processor.cc

 // 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.
 
 #include "media/filters/frame_processor.h"
 
 #include <stdint.h>
 
 #include <cstdlib>
 
@@ skipping 547 matching lines @@
       // processing.
       presentation_timestamp += *timestamp_offset;
 
       // 4.2. Add timestampOffset to the decode timestamp.
       // Frame DTS is only updated if it survives discontinuity processing.
       decode_timestamp += *timestamp_offset;
     }
 
     // 5. Let track buffer equal the track buffer that the coded frame will be
     //    added to.
-
-    // Remap audio and video track types to their special singleton identifiers.
-    StreamParser::TrackId track_id = kAudioTrackId;
-    switch (frame->type()) {
-      case DemuxerStream::AUDIO:
-        break;
-      case DemuxerStream::VIDEO:
-        track_id = kVideoTrackId;
-        break;
-      case DemuxerStream::TEXT:
-        track_id = frame->track_id();
-        break;
-      case DemuxerStream::UNKNOWN:
-      case DemuxerStream::NUM_TYPES:
-        DCHECK(false) << ": Invalid frame type " << frame->type();
-        return false;
-    }
-
+    StreamParser::TrackId track_id = frame->track_id();

[wolenetz, 2016/09/13 21:03:13]

aside: WOOT! :)

[servolk, 2016/09/14 18:15:25]

Acknowledged.

     MseTrackBuffer* track_buffer = FindTrack(track_id);
     if (!track_buffer) {
       MEDIA_LOG(ERROR, media_log_)
           << "Unknown track with type " << frame->GetTypeName()
           << ", frame processor track id " << track_id
           << ", and parser track id " << frame->track_id();
       return false;
     }
+    if (frame->type() != track_buffer->stream()->type()) {
+      MEDIA_LOG(ERROR, media_log_) << "Frame type " << frame->GetTypeName()
+                                   << " doesn't match track buffer type "
+                                   << track_buffer->stream()->type();
+      return false;
+    }
 
     // 6. If last decode timestamp for track buffer is set and decode timestamp
     //    is less than last decode timestamp
     //    OR
     //    If last decode timestamp for track buffer is set and the difference
     //    between decode timestamp and last decode timestamp is greater than 2
     //    times last frame duration:
     DecodeTimestamp track_last_decode_timestamp =
         track_buffer->last_decode_timestamp();
     if (track_last_decode_timestamp != kNoDecodeTimestamp()) {
@@ skipping 153 matching lines @@
     // Step 21 is currently handled differently. See MediaSourceState's
     // |auto_update_timestamp_offset_|.
     return true;
   }
 
   NOTREACHED();
   return false;
 }
 
 }  // namespace media