Stop audio FFmpegDemuxerStreams if we get notified that audio rendering is disabled.

media/filters/ffmpeg_demuxer.h

 // Copyright (c) 2011 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.
 
 // Implements the Demuxer interface using FFmpeg's libavformat.  At this time
 // will support demuxing any audio/video format thrown at it.  The streams
 // output mime types audio/x-ffmpeg and video/x-ffmpeg and include an integer
 // key FFmpegCodecID which contains the CodecID enumeration value.  The CodecIDs
 // can be used to create and initialize the corresponding FFmpeg decoder.
 //
@@ skipping 66 matching lines @@
   // |lock_| for the life of the function so that means |read_callback| must
   // not make calls into FFmpegDemuxerStream directly or that may cause a
   // deadlock. |read_callback| should execute as quickly as possible because
   // |lock_| is held throughout the life of the callback.
   virtual void Read(const ReadCallback& read_callback) OVERRIDE;
   virtual void EnableBitstreamConverter() OVERRIDE;
   virtual const AudioDecoderConfig& audio_decoder_config() OVERRIDE;
   virtual const VideoDecoderConfig& video_decoder_config() OVERRIDE;
 
  private:
+  friend class FFmpegDemuxerTest;
   virtual ~FFmpegDemuxerStream();
 
   // Carries out enqueuing a pending read on the demuxer thread.
   void ReadTask(const ReadCallback& read_callback);
 
   // Attempts to fulfill a single pending read by dequeueing a buffer and read
   // callback pair and executing the callback. The calling function must
   // acquire |lock_| before calling this function.
   void FulfillPendingRead();
 
@@ skipping 113 matching lines @@
 
   MessageLoop* message_loop_;
 
   // True if the media is a local resource, false if the media require network
   // access to be loaded.
   bool local_source_;
 
   // FFmpeg context handle.
   AVFormatContext* format_context_;
 
-  // Two vector of streams:
-  //   - |streams_| is indexed by type for the Demuxer interface GetStream(),
-  //     and contains NULLs for types which aren't present.
-  //   - |packet_streams_| is indexed to mirror AVFormatContext when dealing
-  //     with AVPackets returned from av_read_frame() and contain NULL entries
-  //     representing unsupported streams where we throw away the data.
+  // |streams_| mirrors the AVStream array in |format_context_|. It contains
+  // FFmpegDemuxerStreams encapsluating AVStream objects at the same index.
   //
-  // Ownership is handled via reference counting.
+  // Since we only support a single audio and video stream, |streams_| will
+  // contain NULL entries for additional audio/video streams as well as for
+  // stream types that we do not currently support.
   //
   // Once initialized, operations on FFmpegDemuxerStreams should be carried out
   // on the demuxer thread.
-  typedef std::vector< scoped_refptr<FFmpegDemuxerStream> > StreamVector;
+  typedef std::vector<scoped_refptr<FFmpegDemuxerStream> > StreamVector;
   StreamVector streams_;
-  StreamVector packet_streams_;
 
   // Reference to the data source. Asynchronous read requests are submitted to
   // this object.
   scoped_refptr<DataSource> data_source_;
 
   // This member is used to block on read method calls from FFmpeg and wait
   // until the asynchronous reads in the data source to complete. It is also
   // signaled when the demuxer is being stopped.
   base::WaitableEvent read_event_;
 
@@ skipping 17 matching lines @@
   // starting clock value to match the timestamps in the media file. Default
   // is 0.
   base::TimeDelta start_time_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_DEMUXER_H_