Reland: Add Stop() to AudioDecoder. (https://codereview.chromium.org/126793002/)

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 97 matching lines @@
   }
 
   statistics_cb_ = statistics_cb;
   initialize_cb.Run(PIPELINE_OK);
 }
 
 void FFmpegAudioDecoder::Read(const ReadCB& read_cb) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!read_cb.is_null());
   CHECK(read_cb_.is_null()) << "Overlapping decodes are not supported.";
+  DCHECK(reset_cb_.is_null());
+  DCHECK(stop_cb_.is_null());
 
   read_cb_ = BindToCurrentLoop(read_cb);
 
   // If we don't have any queued audio from the last packet we decoded, ask for
   // more data from the demuxer to satisfy this read.
   if (queued_audio_.empty()) {
     ReadFromDemuxerStream();
     return;
   }
 
@@ skipping 12 matching lines @@
   return channel_layout_;
 }
 
 int FFmpegAudioDecoder::samples_per_second() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   return samples_per_second_;
 }
 
 void FFmpegAudioDecoder::Reset(const base::Closure& closure) {
   DCHECK(task_runner_->BelongsToCurrentThread());
-  base::Closure reset_cb = BindToCurrentLoop(closure);
+  reset_cb_ = BindToCurrentLoop(closure);
 
-  avcodec_flush_buffers(codec_context_.get());
-  ResetTimestampState();
-  queued_audio_.clear();
-  reset_cb.Run();
+  // A demuxer read is pending, we'll wait until it finishes.
+  if (!read_cb_.is_null())
+    return;
+
+  DoReset();
 }
 
-FFmpegAudioDecoder::~FFmpegAudioDecoder() {
-  // TODO(scherkus): should we require Stop() to be called? this might end up
-  // getting called on a random thread due to refcounting.
-  ReleaseFFmpegResources();
+void FFmpegAudioDecoder::Stop(const base::Closure& closure) {
+  DCHECK(task_runner_->BelongsToCurrentThread());
+  stop_cb_ = BindToCurrentLoop(closure);
+
+  // A demuxer read is pending, we'll wait until it finishes.
+  if (!read_cb_.is_null())
+    return;
+
+  if (!reset_cb_.is_null()) {
+    DoReset();
+    return;
+  }
+
+  DoStop();
 }
 
+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 45 matching lines @@
 
   // Now create an AVBufferRef for the data just allocated. It will own the
   // reference to the AudioBuffer object.
   void* opaque = NULL;
   buffer.swap(reinterpret_cast<AudioBuffer**>(&opaque));
   frame->buf[0] = av_buffer_create(
       frame->data[0], buffer_size_in_bytes, ReleaseAudioBufferImpl, opaque, 0);
   return 0;
 }
 
+void FFmpegAudioDecoder::DoStop() {
+  DCHECK(task_runner_->BelongsToCurrentThread());
+  DCHECK(!stop_cb_.is_null());
+  DCHECK(read_cb_.is_null());
+  DCHECK(reset_cb_.is_null());
+
+  ResetTimestampState();
+  queued_audio_.clear();
+  ReleaseFFmpegResources();
+  base::ResetAndReturn(&stop_cb_).Run();
+}
+
+void FFmpegAudioDecoder::DoReset() {
+  DCHECK(task_runner_->BelongsToCurrentThread());
+  DCHECK(!reset_cb_.is_null());
+  DCHECK(read_cb_.is_null());
+
+  avcodec_flush_buffers(codec_context_.get());
+  ResetTimestampState();
+  queued_audio_.clear();
+  base::ResetAndReturn(&reset_cb_).Run();
+
+  if (!stop_cb_.is_null())
+    DoStop();
+}
+
 void FFmpegAudioDecoder::ReadFromDemuxerStream() {
   DCHECK(!read_cb_.is_null());
   demuxer_stream_->Read(base::Bind(
       &FFmpegAudioDecoder::BufferReady, weak_this_));
 }
 
 void FFmpegAudioDecoder::BufferReady(
     DemuxerStream::Status status,
     const scoped_refptr<DecoderBuffer>& input) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!read_cb_.is_null());
   DCHECK(queued_audio_.empty());
   DCHECK_EQ(status != DemuxerStream::kOk, !input.get()) << status;
 
+  // Pending Reset: ignore the buffer we just got, send kAborted to |read_cb_|
+  // and carry out the Reset().
+  // If there happens to also be a pending Stop(), that will be handled at
+  // the end of DoReset().
+  if (!reset_cb_.is_null()) {
+    base::ResetAndReturn(&read_cb_).Run(kAborted, NULL);
+    DoReset();
+    return;
+  }
+
+  // Pending Stop: ignore the buffer we just got, send kAborted to |read_cb_|
+  // and carry out the Stop().
+  if (!stop_cb_.is_null()) {
+    base::ResetAndReturn(&read_cb_).Run(kAborted, NULL);
+    DoStop();
+    return;
+  }
+
   if (status == DemuxerStream::kAborted) {
     DCHECK(!input.get());
     base::ResetAndReturn(&read_cb_).Run(kAborted, NULL);
     return;
   }
 
   if (status == DemuxerStream::kConfigChanged) {
     DCHECK(!input.get());
 
     // Send a "end of stream" buffer to the decode loop
@@ skipping 279 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