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

Side by Side Diff: ppapi/cpp/private/content_decryptor_private.cc

Issue 179123009: Encrypted Media: Use uint32 for systemCode in SessionError. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 "ppapi/cpp/private/content_decryptor_private.h" 5 #include "ppapi/cpp/private/content_decryptor_private.h"
6 6
7 #include <cstring> // memcpy 7 #include <cstring> // memcpy
8 8
9 #include "ppapi/c/ppb_var.h" 9 #include "ppapi/c/ppb_var.h"
10 #include "ppapi/c/private/ppb_content_decryptor_private.h" 10 #include "ppapi/c/private/ppb_content_decryptor_private.h"
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 257
258 void ContentDecryptor_Private::SessionClosed(uint32_t session_id) { 258 void ContentDecryptor_Private::SessionClosed(uint32_t session_id) {
259 if (has_interface<PPB_ContentDecryptor_Private>()) { 259 if (has_interface<PPB_ContentDecryptor_Private>()) {
260 get_interface<PPB_ContentDecryptor_Private>()->SessionClosed( 260 get_interface<PPB_ContentDecryptor_Private>()->SessionClosed(
261 associated_instance_.pp_instance(), session_id); 261 associated_instance_.pp_instance(), session_id);
262 } 262 }
263 } 263 }
264 264
265 void ContentDecryptor_Private::SessionError(uint32_t session_id, 265 void ContentDecryptor_Private::SessionError(uint32_t session_id,
266 int32_t media_error, 266 int32_t media_error,
267 int32_t system_code) { 267 uint32_t system_code) {
268 if (has_interface<PPB_ContentDecryptor_Private>()) { 268 if (has_interface<PPB_ContentDecryptor_Private>()) {
269 get_interface<PPB_ContentDecryptor_Private>()->SessionError( 269 get_interface<PPB_ContentDecryptor_Private>()->SessionError(
270 associated_instance_.pp_instance(), 270 associated_instance_.pp_instance(),
271 session_id, 271 session_id,
272 media_error, 272 media_error,
273 system_code); 273 system_code);
274 } 274 }
275 } 275 }
276 276
277 void ContentDecryptor_Private::DeliverBlock( 277 void ContentDecryptor_Private::DeliverBlock(
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 const PP_DecryptedSampleInfo& decrypted_sample_info) { 336 const PP_DecryptedSampleInfo& decrypted_sample_info) {
337 if (has_interface<PPB_ContentDecryptor_Private>()) { 337 if (has_interface<PPB_ContentDecryptor_Private>()) {
338 get_interface<PPB_ContentDecryptor_Private>()->DeliverSamples( 338 get_interface<PPB_ContentDecryptor_Private>()->DeliverSamples(
339 associated_instance_.pp_instance(), 339 associated_instance_.pp_instance(),
340 audio_frames.pp_resource(), 340 audio_frames.pp_resource(),
341 &decrypted_sample_info); 341 &decrypted_sample_info);
342 } 342 }
343 } 343 }
344 344
345 } // namespace pp 345 } // namespace pp
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698