Add Stop() to AudioDecoder.

media/filters/ffmpeg_audio_decoder.cc

 // 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.
 
 #include "media/filters/ffmpeg_audio_decoder.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 137 matching lines @@
 void FFmpegAudioDecoder::Reset(const base::Closure& closure) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   base::Closure reset_cb = BindToCurrentLoop(closure);
 
   avcodec_flush_buffers(codec_context_.get());
   ResetTimestampState();
   queued_audio_.clear();
   reset_cb.Run();
 }
 
-FFmpegAudioDecoder::~FFmpegAudioDecoder() {
-  // TODO(scherkus): should we require Stop() to be called? this might end up
-  // getting called on a random thread due to refcounting.
+void FFmpegAudioDecoder::Stop(const base::Closure& closure) {
+  DCHECK(task_runner_->BelongsToCurrentThread());
+  base::Closure stop_cb = BindToCurrentLoop(closure);
+
+  ResetTimestampState();
+  queued_audio_.clear();
   ReleaseFFmpegResources();
+
+  // TODO(rileya): Properly handle the case in which we have a pending

[DaleCurtis, 2014/01/09 01:24:49]

Hmm, I suspect you may need to handle that in this CL. The previous behavior
didn't clear this until destruction. Yet now you might have BufferReady() return
with a valid buffer, which will wreck havok in the RunDecodeLoop() function.

+  // |read_cb_| when Stop() or Reset()-ing.
+  stop_cb.Run();
 }
 
+FFmpegAudioDecoder::~FFmpegAudioDecoder() {}
+
 int FFmpegAudioDecoder::GetAudioBuffer(AVCodecContext* codec,
                                        AVFrame* frame,
                                        int flags) {
   // Since this routine is called by FFmpeg when a buffer is required for audio
   // data, use the values supplied by FFmpeg (ignoring the current settings).
   // RunDecodeLoop() gets to determine if the buffer is useable or not.
   AVSampleFormat format = static_cast<AVSampleFormat>(frame->format);
   SampleFormat sample_format = AVSampleFormatToSampleFormat(format);
   int channels = DetermineChannels(frame);
   if ((channels <= 0) || (channels >= limits::kMaxChannels)) {
@@ skipping 358 matching lines @@
     // Decoding finished successfully, update statistics.
     if (result > 0) {
       PipelineStatistics statistics;
       statistics.audio_bytes_decoded = result;
       statistics_cb_.Run(statistics);
     }
   } while (packet.size > 0);
 }
 
 }  // namespace media