Remove locking from FFmpegDemuxerStream and associated TODOs from media code.

media/filters/ffmpeg_audio_decoder.h

 // Copyright (c) 2012 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_FFMPEG_AUDIO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
 
 #include <list>
 
 #include "base/callback.h"
@@ skipping 38 matching lines @@
   void DoInitialize(const scoped_refptr<DemuxerStream>& stream,
                     const PipelineStatusCB& status_cb,
                     const StatisticsCB& statistics_cb);
   void DoReset(const base::Closure& closure);
   void DoRead(const ReadCB& read_cb);
   void DoDecodeBuffer(DemuxerStream::Status status,
                       const scoped_refptr<DecoderBuffer>& input);
 
   // Reads from the demuxer stream with corresponding callback method.
   void ReadFromDemuxerStream();
-  void DecodeBuffer(DemuxerStream::Status status,
-                    const scoped_refptr<DecoderBuffer>& buffer);
 
   // Returns the timestamp that should be used for the next buffer returned
   // via |read_cb_|. It is calculated from |output_timestamp_base_| and
   // |total_frames_decoded_|.
   base::TimeDelta GetNextOutputTimestamp() const;
 
   // This is !is_null() iff Initialize() hasn't been called.
   MessageLoopFactoryCB message_loop_factory_cb_;
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
@@ skipping 25 matching lines @@
   // Since multiple frames may be decoded from the same packet we need to queue
   // them up and hand them out as we receive Read() calls.
   std::list<QueuedAudioBuffer> queued_audio_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_