Update Decryptor interface to support audio decoding.

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 165 matching lines @@
   if (!message_loop_->BelongsToCurrentThread()) {
     message_loop_->PostTask(FROM_HERE, base::Bind(
         &FFmpegVideoDecoder::Reset, this, closure));
     return;
   }
 
   DCHECK(reset_cb_.is_null());
   reset_cb_ = closure;
 
   if (decryptor_)
-    decryptor_->CancelDecrypt();
+    decryptor_->CancelDecrypt(Decryptor::kVideo);
 
   // Defer the reset if a read is pending.
   if (!read_cb_.is_null())
     return;
 
   DoReset();
 }
 
 void FFmpegVideoDecoder::DoReset() {
   DCHECK(read_cb_.is_null());
@@ skipping 14 matching lines @@
   DCHECK(stop_cb_.is_null());
 
   if (state_ == kUninitialized) {
     closure.Run();
     return;
   }
 
   stop_cb_ = closure;
 
   if (decryptor_)
-    decryptor_->CancelDecrypt();
+    decryptor_->CancelDecrypt(Decryptor::kVideo);
 
   // Defer stopping if a read is pending.
   if (!read_cb_.is_null())
     return;
 
   DoStop();
 }
 
 void FFmpegVideoDecoder::DoStop() {
   ReleaseFFmpegResources();
@@ skipping 73 matching lines @@
       return;
     }
 
     ReadFromDemuxerStream();
     return;
   }
 
   DCHECK_EQ(status, DemuxerStream::kOk);
 
   if (buffer->GetDecryptConfig() && buffer->GetDataSize()) {
-    decryptor_->Decrypt(buffer,
+    decryptor_->Decrypt(Decryptor::kVideo,
+                        buffer,
                         base::Bind(&FFmpegVideoDecoder::BufferDecrypted, this));
     return;
   }
 
   DecodeBuffer(buffer);
 }
 
 void FFmpegVideoDecoder::BufferDecrypted(
     Decryptor::Status decrypt_status,
     const scoped_refptr<DecoderBuffer>& buffer) {
@@ skipping 215 matching lines @@
   if (!codec || avcodec_open2(codec_context_, codec, NULL) < 0) {
     ReleaseFFmpegResources();
     return false;
   }
 
   av_frame_ = avcodec_alloc_frame();
   return true;
 }
 
 }  // namespace media