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

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

Issue 10964055: Call Decryptor::Stop() in FFmpegVideoDecoder::Reset(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 2 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 | « webkit/media/crypto/ppapi_decryptor.h ('k') | webkit/media/crypto/proxy_decryptor.h » ('j') | 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/location.h" 10 #include "base/location.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 FROM_HERE, 90 FROM_HERE,
91 base::Bind(&PpapiDecryptor::Decrypt, base::Unretained(this), 91 base::Bind(&PpapiDecryptor::Decrypt, base::Unretained(this),
92 encrypted, decrypt_cb)); 92 encrypted, decrypt_cb));
93 return; 93 return;
94 } 94 }
95 95
96 if (!cdm_plugin_->Decrypt(encrypted, decrypt_cb)) 96 if (!cdm_plugin_->Decrypt(encrypted, decrypt_cb))
97 decrypt_cb.Run(kError, NULL); 97 decrypt_cb.Run(kError, NULL);
98 } 98 }
99 99
100 void PpapiDecryptor::Stop() { 100 void PpapiDecryptor::CancelDecrypt() {
101 } 101 }
102 102
103 void PpapiDecryptor::ReportFailureToCallPlugin(const std::string& key_system, 103 void PpapiDecryptor::ReportFailureToCallPlugin(const std::string& key_system,
104 const std::string& session_id) { 104 const std::string& session_id) {
105 DVLOG(1) << "Failed to call plugin."; 105 DVLOG(1) << "Failed to call plugin.";
106 client_->KeyError(key_system, session_id, kUnknownError, 0); 106 client_->KeyError(key_system, session_id, kUnknownError, 0);
107 } 107 }
108 108
109 } // namespace webkit_media 109 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/crypto/ppapi_decryptor.h ('k') | webkit/media/crypto/proxy_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698