media: Allow config change between clear and encrypted streams

content/renderer/media/cdm/ppapi_decryptor.cc

 // Copyright 2013 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 "content/renderer/media/cdm/ppapi_decryptor.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 230 matching lines @@
     const scoped_refptr<media::DecoderBuffer>& encrypted,
     const DecryptCB& decrypt_cb) {
   if (!render_task_runner_->BelongsToCurrentThread()) {
     render_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&PpapiDecryptor::Decrypt, weak_ptr_factory_.GetWeakPtr(),
                    stream_type, encrypted, decrypt_cb));
     return;
   }
 
+  // TODO(xhwang): If the buffer is not encrypted, return it directly.
+
   DVLOG(3) << __func__ << " - stream_type: " << stream_type;
   if (!CdmDelegate() ||
       !CdmDelegate()->Decrypt(stream_type, encrypted, decrypt_cb)) {
     decrypt_cb.Run(kError, NULL);
   }
 }
 
 void PpapiDecryptor::CancelDecrypt(StreamType stream_type) {
   if (!render_task_runner_->BelongsToCurrentThread()) {
     render_task_runner_->PostTask(
@@ skipping 11 matching lines @@
     const media::AudioDecoderConfig& config,
     const DecoderInitCB& init_cb) {
   if (!render_task_runner_->BelongsToCurrentThread()) {
     render_task_runner_->PostTask(
         FROM_HERE, base::Bind(&PpapiDecryptor::InitializeAudioDecoder,
                               weak_ptr_factory_.GetWeakPtr(), config, init_cb));
     return;
   }
 
   DVLOG(2) << __func__;
-  DCHECK(config.is_encrypted());
   DCHECK(config.IsValidConfig());
 
   audio_decoder_init_cb_ = init_cb;
   if (!CdmDelegate() ||
       !CdmDelegate()->InitializeAudioDecoder(
           config, base::Bind(&PpapiDecryptor::OnDecoderInitialized,
                              weak_ptr_factory_.GetWeakPtr(), kAudio))) {
     base::ResetAndReturn(&audio_decoder_init_cb_).Run(false);
     return;
   }
 }
 
 void PpapiDecryptor::InitializeVideoDecoder(
     const media::VideoDecoderConfig& config,
     const DecoderInitCB& init_cb) {
   if (!render_task_runner_->BelongsToCurrentThread()) {
     render_task_runner_->PostTask(
         FROM_HERE, base::Bind(&PpapiDecryptor::InitializeVideoDecoder,
                               weak_ptr_factory_.GetWeakPtr(), config, init_cb));
     return;
   }
 
   DVLOG(2) << __func__;
-  DCHECK(config.is_encrypted());
   DCHECK(config.IsValidConfig());
 
   video_decoder_init_cb_ = init_cb;
   if (!CdmDelegate() ||
       !CdmDelegate()->InitializeVideoDecoder(
           config, base::Bind(&PpapiDecryptor::OnDecoderInitialized,
                              weak_ptr_factory_.GetWeakPtr(), kVideo))) {
     base::ResetAndReturn(&video_decoder_init_cb_).Run(false);
     return;
   }
@@ skipping 127 matching lines @@
   base::AutoLock auto_lock(lock_);
   had_fatal_plugin_error_ = true;
 }
 
 ContentDecryptorDelegate* PpapiDecryptor::CdmDelegate() {
   DCHECK(render_task_runner_->BelongsToCurrentThread());
   return (pepper_cdm_wrapper_) ? pepper_cdm_wrapper_->GetCdmDelegate() : NULL;
 }
 
 }  // namespace content