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

Side by Side Diff: ppapi/thunk/ppb_content_decryptor_private_thunk.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 // From private/ppb_content_decryptor_private.idl, 5 // From private/ppb_content_decryptor_private.idl,
6 // modified Mon Jan 13 12:02:23 2014. 6 // modified Wed Feb 26 16:37:47 2014.
7 7
8 #include "ppapi/c/pp_errors.h" 8 #include "ppapi/c/pp_errors.h"
9 #include "ppapi/c/private/ppb_content_decryptor_private.h" 9 #include "ppapi/c/private/ppb_content_decryptor_private.h"
10 #include "ppapi/shared_impl/tracked_callback.h" 10 #include "ppapi/shared_impl/tracked_callback.h"
11 #include "ppapi/thunk/enter.h" 11 #include "ppapi/thunk/enter.h"
12 #include "ppapi/thunk/ppapi_thunk_export.h" 12 #include "ppapi/thunk/ppapi_thunk_export.h"
13 13
14 namespace ppapi { 14 namespace ppapi {
15 namespace thunk { 15 namespace thunk {
16 16
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 VLOG(4) << "PPB_ContentDecryptor_Private::SessionClosed()"; 52 VLOG(4) << "PPB_ContentDecryptor_Private::SessionClosed()";
53 EnterInstance enter(instance); 53 EnterInstance enter(instance);
54 if (enter.failed()) 54 if (enter.failed())
55 return; 55 return;
56 enter.functions()->SessionClosed(instance, session_id); 56 enter.functions()->SessionClosed(instance, session_id);
57 } 57 }
58 58
59 void SessionError(PP_Instance instance, 59 void SessionError(PP_Instance instance,
60 uint32_t session_id, 60 uint32_t session_id,
61 int32_t media_error, 61 int32_t media_error,
62 int32_t system_code) { 62 uint32_t system_code) {
63 VLOG(4) << "PPB_ContentDecryptor_Private::SessionError()"; 63 VLOG(4) << "PPB_ContentDecryptor_Private::SessionError()";
64 EnterInstance enter(instance); 64 EnterInstance enter(instance);
65 if (enter.failed()) 65 if (enter.failed())
66 return; 66 return;
67 enter.functions()->SessionError(instance, 67 enter.functions()->SessionError(instance,
68 session_id, 68 session_id,
69 media_error, 69 media_error,
70 system_code); 70 system_code);
71 } 71 }
72 72
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 const struct PP_DecryptedSampleInfo* decrypted_sample_info) { 136 const struct PP_DecryptedSampleInfo* decrypted_sample_info) {
137 VLOG(4) << "PPB_ContentDecryptor_Private::DeliverSamples()"; 137 VLOG(4) << "PPB_ContentDecryptor_Private::DeliverSamples()";
138 EnterInstance enter(instance); 138 EnterInstance enter(instance);
139 if (enter.failed()) 139 if (enter.failed())
140 return; 140 return;
141 enter.functions()->DeliverSamples(instance, 141 enter.functions()->DeliverSamples(instance,
142 audio_frames, 142 audio_frames,
143 decrypted_sample_info); 143 decrypted_sample_info);
144 } 144 }
145 145
146 const PPB_ContentDecryptor_Private_0_10 146 const PPB_ContentDecryptor_Private_0_11
147 g_ppb_contentdecryptor_private_thunk_0_10 = { 147 g_ppb_contentdecryptor_private_thunk_0_11 = {
148 &SessionCreated, 148 &SessionCreated,
149 &SessionMessage, 149 &SessionMessage,
150 &SessionReady, 150 &SessionReady,
151 &SessionClosed, 151 &SessionClosed,
152 &SessionError, 152 &SessionError,
153 &DeliverBlock, 153 &DeliverBlock,
154 &DecoderInitializeDone, 154 &DecoderInitializeDone,
155 &DecoderDeinitializeDone, 155 &DecoderDeinitializeDone,
156 &DecoderResetDone, 156 &DecoderResetDone,
157 &DeliverFrame, 157 &DeliverFrame,
158 &DeliverSamples 158 &DeliverSamples
159 }; 159 };
160 160
161 } // namespace 161 } // namespace
162 162
163 PPAPI_THUNK_EXPORT const PPB_ContentDecryptor_Private_0_10* 163 PPAPI_THUNK_EXPORT const PPB_ContentDecryptor_Private_0_11*
164 GetPPB_ContentDecryptor_Private_0_10_Thunk() { 164 GetPPB_ContentDecryptor_Private_0_11_Thunk() {
165 return &g_ppb_contentdecryptor_private_thunk_0_10; 165 return &g_ppb_contentdecryptor_private_thunk_0_11;
166 } 166 }
167 167
168 } // namespace thunk 168 } // namespace thunk
169 } // namespace ppapi 169 } // namespace ppapi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698