Call Decryptor::Stop() in FFmpegVideoDecoder::Reset().

media/filters/ffmpeg_video_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_video_decoder.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 161 matching lines @@
       &FFmpegVideoDecoder::DoRead, this, read_cb));
 }
 
 void FFmpegVideoDecoder::Reset(const base::Closure& closure) {
   if (!message_loop_->BelongsToCurrentThread()) {
     message_loop_->PostTask(FROM_HERE, base::Bind(
         &FFmpegVideoDecoder::Reset, this, closure));
     return;
   }
 
+  if (decryptor_)
+    decryptor_->Stop();

[xhwang, 2012/09/22 01:00:49]

Maybe rename Decryptor::Stop() to something like Flush() or CancelDecrypt()?

[scherkus (not reviewing), 2012/09/23 20:01:16]

Agreed as Stop() is implies there's a Start() -- Flush(), Reset(), or Cancel()
all work.

[xhwang, 2012/09/24 17:27:01]

Renamed Stop() to CancelDecrypt(). I know CancelDecrypt isn't correct English
but it makes it clear that we are cancelling decryption operations (and
DecryptCBs) scheduled by Decrypt() calls. WDYT?

[scherkus (not reviewing), 2012/09/24 20:22:33]

SGTM

+
   reset_cb_ = closure;
 
   // Defer the reset if a read is pending.
   if (!read_cb_.is_null())
     return;
 
   DoReset();
 }
 
 void FFmpegVideoDecoder::DoReset() {
@@ skipping 47 matching lines @@
   // Return empty frames if decoding has finished.
   if (state_ == kDecodeFinished) {
     read_cb.Run(kOk, VideoFrame::CreateEmptyFrame());
     return;
   }
 
   read_cb_ = read_cb;
   ReadFromDemuxerStream();
 }
 
-
 void FFmpegVideoDecoder::ReadFromDemuxerStream() {
   DCHECK_NE(state_, kUninitialized);
   DCHECK_NE(state_, kDecodeFinished);
   DCHECK(!read_cb_.is_null());
 
   demuxer_stream_->Read(base::Bind(&FFmpegVideoDecoder::DecryptOrDecodeBuffer,
                                    this));
 }
 
 void FFmpegVideoDecoder::DecryptOrDecodeBuffer(
@@ skipping 60 matching lines @@
 }
 
 void FFmpegVideoDecoder::DoBufferDecrypted(
     Decryptor::Status decrypt_status,
     const scoped_refptr<DecoderBuffer>& buffer) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK_NE(state_, kUninitialized);
   DCHECK_NE(state_, kDecodeFinished);
   DCHECK(!read_cb_.is_null());
 
+  if (!stop_cb_.is_null()) {
+    base::ResetAndReturn(&read_cb_).Run(kOk, NULL);
+    DoStop();
+    return;
+  }
+
   if (!reset_cb_.is_null()) {
     base::ResetAndReturn(&read_cb_).Run(kOk, NULL);
     DoReset();
     return;
   }
 
   if (decrypt_status == Decryptor::kNoKey ||
       decrypt_status == Decryptor::kError) {
     state_ = kDecodeFinished;
     base::ResetAndReturn(&read_cb_).Run(kDecryptError, NULL);
@@ skipping 188 matching lines @@
     return false;
 
   if (avcodec_open2(codec_context_, codec, NULL) < 0)
     return false;
 
   av_frame_ = avcodec_alloc_frame();
   return true;
 }
 
 }  // namespace media