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

Side by Side Diff: content/renderer/pepper/content_decryptor_delegate.cc

Issue 179123009: Encrypted Media: Use uint32 for systemCode in SessionError. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 9 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
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 "content/renderer/pepper/content_decryptor_delegate.h" 5 #include "content/renderer/pepper/content_decryptor_delegate.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "base/numerics/safe_conversions.h" 10 #include "base/numerics/safe_conversions.h"
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 620
621 void ContentDecryptorDelegate::OnSessionClosed(uint32 session_id) { 621 void ContentDecryptorDelegate::OnSessionClosed(uint32 session_id) {
622 if (session_closed_cb_.is_null()) 622 if (session_closed_cb_.is_null())
623 return; 623 return;
624 624
625 session_closed_cb_.Run(session_id); 625 session_closed_cb_.Run(session_id);
626 } 626 }
627 627
628 void ContentDecryptorDelegate::OnSessionError(uint32 session_id, 628 void ContentDecryptorDelegate::OnSessionError(uint32 session_id,
629 int32_t media_error, 629 int32_t media_error,
630 int32_t system_code) { 630 uint32_t system_code) {
631 if (session_error_cb_.is_null()) 631 if (session_error_cb_.is_null())
632 return; 632 return;
633 633
634 session_error_cb_.Run(session_id, 634 session_error_cb_.Run(session_id,
635 static_cast<media::MediaKeys::KeyError>(media_error), 635 static_cast<media::MediaKeys::KeyError>(media_error),
636 system_code); 636 system_code);
637 } 637 }
638 638
639 void ContentDecryptorDelegate::DecoderInitializeDone( 639 void ContentDecryptorDelegate::DecoderInitializeDone(
640 PP_DecryptorStreamType decoder_type, 640 PP_DecryptorStreamType decoder_type,
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
1055 const media::Decryptor::AudioBuffers empty_frames; 1055 const media::Decryptor::AudioBuffers empty_frames;
1056 audio_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, 1056 audio_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError,
1057 empty_frames); 1057 empty_frames);
1058 } 1058 }
1059 1059
1060 if (!video_decode_cb_.is_null()) 1060 if (!video_decode_cb_.is_null())
1061 video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL); 1061 video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL);
1062 } 1062 }
1063 1063
1064 } // namespace content 1064 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/content_decryptor_delegate.h ('k') | content/renderer/pepper/pepper_plugin_instance_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698