Adds a second vector of streams to FFmpegDemuxer to handle re-mapped audio/video streams.

media/filters/ffmpeg_demuxer.cc

 // Copyright (c) 2009 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 "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "media/base/filter_host.h"
 #include "media/filters/ffmpeg_common.h"
 #include "media/filters/ffmpeg_demuxer.h"
@@ skipping 260 matching lines @@
   // Create demuxer streams for all supported streams.
   base::TimeDelta max_duration;
   for (size_t i = 0; i < format_context_->nb_streams; ++i) {
     CodecType codec_type = format_context_->streams[i]->codec->codec_type;
     if (codec_type == CODEC_TYPE_AUDIO || codec_type == CODEC_TYPE_VIDEO) {
       AVStream* stream = format_context_->streams[i];
       FFmpegDemuxerStream* demuxer_stream
           = new FFmpegDemuxerStream(this, stream);
       DCHECK(demuxer_stream);
       streams_.push_back(demuxer_stream);
+      packet_streams_.push_back(demuxer_stream);
       max_duration = std::max(max_duration, demuxer_stream->duration());
+    } else {
+      packet_streams_.push_back(NULL);
     }
   }
   if (streams_.empty()) {
     host_->Error(DEMUXER_ERROR_NO_SUPPORTED_STREAMS);
     return;
   }
 
   // Good to go: set the duration and notify we're done initializing.
   host_->SetDuration(max_duration);
   host_->InitializationComplete();
@@ skipping 33 matching lines @@
     // of stream flag.
     NOTIMPLEMENTED();
     return;
   }
 
   // Queue the packet with the appropriate stream.
   // TODO(scherkus): should we post this back to the pipeline thread?  I'm
   // worried about downstream filters (i.e., decoders) executing on this
   // thread.
   DCHECK(packet->stream_index >= 0);
-  DCHECK(packet->stream_index < static_cast<int>(streams_.size()));
-  FFmpegDemuxerStream* demuxer_stream = streams_[packet->stream_index];
-  current_timestamp_ = demuxer_stream->EnqueuePacket(packet.release());
+  DCHECK(packet->stream_index < static_cast<int>(packet_streams_.size()));
+  FFmpegDemuxerStream* demuxer_stream = packet_streams_[packet->stream_index];
+  if (demuxer_stream) {
+    current_timestamp_ = demuxer_stream->EnqueuePacket(packet.release());
+  } else {
+    av_free_packet(packet.get());
+  }
 
   // Create a loop by posting another task.  This allows seek and message loop
   // quit tasks to get processed.
   if (StreamsHavePendingReads()) {
     PostDemuxTask();
   }
 }
 
 bool FFmpegDemuxer::StreamsHavePendingReads() {
   StreamVector::iterator iter;
   for (iter = streams_.begin(); iter != streams_.end(); ++iter) {
     if ((*iter)->HasPendingReads()) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace media