Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Side by Side Diff: webkit/media/crypto/ppapi_decryptor.cc

Issue 11824008: Encrypted Media: Reduce DecryptAndDecodeAudio log level in PpapiDecryptor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/media/crypto/ppapi_decryptor.h" 5 #include "webkit/media/crypto/ppapi_decryptor.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 void PpapiDecryptor::DecryptAndDecodeAudio( 186 void PpapiDecryptor::DecryptAndDecodeAudio(
187 const scoped_refptr<media::DecoderBuffer>& encrypted, 187 const scoped_refptr<media::DecoderBuffer>& encrypted,
188 const AudioDecodeCB& audio_decode_cb) { 188 const AudioDecodeCB& audio_decode_cb) {
189 if (!render_loop_proxy_->BelongsToCurrentThread()) { 189 if (!render_loop_proxy_->BelongsToCurrentThread()) {
190 render_loop_proxy_->PostTask(FROM_HERE, base::Bind( 190 render_loop_proxy_->PostTask(FROM_HERE, base::Bind(
191 &PpapiDecryptor::DecryptAndDecodeAudio, weak_this_, 191 &PpapiDecryptor::DecryptAndDecodeAudio, weak_this_,
192 encrypted, audio_decode_cb)); 192 encrypted, audio_decode_cb));
193 return; 193 return;
194 } 194 }
195 195
196 DVLOG(1) << "DecryptAndDecodeAudio()"; 196 DVLOG(3) << "DecryptAndDecodeAudio()";
197 if (!plugin_cdm_delegate_->DecryptAndDecodeAudio(encrypted, audio_decode_cb)) 197 if (!plugin_cdm_delegate_->DecryptAndDecodeAudio(encrypted, audio_decode_cb))
198 audio_decode_cb.Run(kError, AudioBuffers()); 198 audio_decode_cb.Run(kError, AudioBuffers());
199 } 199 }
200 200
201 void PpapiDecryptor::DecryptAndDecodeVideo( 201 void PpapiDecryptor::DecryptAndDecodeVideo(
202 const scoped_refptr<media::DecoderBuffer>& encrypted, 202 const scoped_refptr<media::DecoderBuffer>& encrypted,
203 const VideoDecodeCB& video_decode_cb) { 203 const VideoDecodeCB& video_decode_cb) {
204 if (!render_loop_proxy_->BelongsToCurrentThread()) { 204 if (!render_loop_proxy_->BelongsToCurrentThread()) {
205 render_loop_proxy_->PostTask(FROM_HERE, base::Bind( 205 render_loop_proxy_->PostTask(FROM_HERE, base::Bind(
206 &PpapiDecryptor::DecryptAndDecodeVideo, weak_this_, 206 &PpapiDecryptor::DecryptAndDecodeVideo, weak_this_,
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 const std::string& session_id, 283 const std::string& session_id,
284 const std::string& type, 284 const std::string& type,
285 scoped_array<uint8> init_data, 285 scoped_array<uint8> init_data,
286 int init_data_size) { 286 int init_data_size) {
287 DCHECK(render_loop_proxy_->BelongsToCurrentThread()); 287 DCHECK(render_loop_proxy_->BelongsToCurrentThread());
288 need_key_cb_.Run(key_system, session_id, type, 288 need_key_cb_.Run(key_system, session_id, type,
289 init_data.Pass(), init_data_size); 289 init_data.Pass(), init_data_size);
290 } 290 }
291 291
292 } // namespace webkit_media 292 } // namespace webkit_media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698