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

Side by Side Diff: media/base/android/media_drm_bridge.h

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix isRenewalMessage() in browser tests. Created 4 years, 10 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <string> 10 #include <string>
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 // Note: No |system_error| is available from MediaDrm. 183 // Note: No |system_error| is available from MediaDrm.
184 // TODO(xhwang): Implement Exception code. 184 // TODO(xhwang): Implement Exception code.
185 void OnPromiseRejected( 185 void OnPromiseRejected(
186 JNIEnv* env, 186 JNIEnv* env,
187 const base::android::JavaParamRef<jobject>& j_media_drm, 187 const base::android::JavaParamRef<jobject>& j_media_drm,
188 jint j_promise_id, 188 jint j_promise_id,
189 const base::android::JavaParamRef<jstring>& j_error_message); 189 const base::android::JavaParamRef<jstring>& j_error_message);
190 190
191 // Session event callbacks. 191 // Session event callbacks.
192 192
193 // TODO(xhwang): Remove |j_legacy_destination_url| when prefixed EME support 193 // TODO(xhwang): Remove |j_legacy_destination_url| now that prefixed EME
194 // is removed. 194 // support is removed. http://crbug.com/249976
195 void OnSessionMessage( 195 void OnSessionMessage(
196 JNIEnv* env, 196 JNIEnv* env,
197 const base::android::JavaParamRef<jobject>& j_media_drm, 197 const base::android::JavaParamRef<jobject>& j_media_drm,
198 const base::android::JavaParamRef<jbyteArray>& j_session_id, 198 const base::android::JavaParamRef<jbyteArray>& j_session_id,
199 jint j_message_type, 199 jint j_message_type,
200 const base::android::JavaParamRef<jbyteArray>& j_message, 200 const base::android::JavaParamRef<jbyteArray>& j_message,
201 const base::android::JavaParamRef<jstring>& j_legacy_destination_url); 201 const base::android::JavaParamRef<jstring>& j_legacy_destination_url);
202 void OnSessionClosed( 202 void OnSessionClosed(
203 JNIEnv* env, 203 JNIEnv* env,
204 const base::android::JavaParamRef<jobject>& j_media_drm, 204 const base::android::JavaParamRef<jobject>& j_media_drm,
(...skipping 12 matching lines...) Expand all
217 void OnSessionExpirationUpdate( 217 void OnSessionExpirationUpdate(
218 JNIEnv* env, 218 JNIEnv* env,
219 const base::android::JavaParamRef<jobject>& j_media_drm, 219 const base::android::JavaParamRef<jobject>& j_media_drm,
220 const base::android::JavaParamRef<jbyteArray>& j_session_id, 220 const base::android::JavaParamRef<jbyteArray>& j_session_id,
221 jlong expiry_time_ms); 221 jlong expiry_time_ms);
222 222
223 // Called by the CDM when an error occurred in session |j_session_id| 223 // Called by the CDM when an error occurred in session |j_session_id|
224 // unrelated to one of the MediaKeys calls that accept a |promise|. 224 // unrelated to one of the MediaKeys calls that accept a |promise|.
225 // Note: 225 // Note:
226 // - This method is only for supporting prefixed EME API. 226 // - This method is only for supporting prefixed EME API.
227 // TODO(ddorwin): Remove it now. https://crbug.com/249976
227 // - This method will be ignored by unprefixed EME. All errors reported 228 // - This method will be ignored by unprefixed EME. All errors reported
228 // in this method should probably also be reported by one of other methods. 229 // in this method should probably also be reported by one of other methods.
229 void OnLegacySessionError( 230 void OnLegacySessionError(
230 JNIEnv* env, 231 JNIEnv* env,
231 const base::android::JavaParamRef<jobject>& j_media_drm, 232 const base::android::JavaParamRef<jobject>& j_media_drm,
232 const base::android::JavaParamRef<jbyteArray>& j_session_id, 233 const base::android::JavaParamRef<jbyteArray>& j_session_id,
233 const base::android::JavaParamRef<jstring>& j_error_message); 234 const base::android::JavaParamRef<jstring>& j_error_message);
234 235
235 // Called by the java object when credential reset is completed. 236 // Called by the java object when credential reset is completed.
236 void OnResetDeviceCredentialsCompleted( 237 void OnResetDeviceCredentialsCompleted(
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 318
318 // NOTE: Weak pointers must be invalidated before all other member variables. 319 // NOTE: Weak pointers must be invalidated before all other member variables.
319 base::WeakPtrFactory<MediaDrmBridge> weak_factory_; 320 base::WeakPtrFactory<MediaDrmBridge> weak_factory_;
320 321
321 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge); 322 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
322 }; 323 };
323 324
324 } // namespace media 325 } // namespace media
325 326
326 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 327 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
OLDNEW
« no previous file with comments | « media/base/android/java/src/org/chromium/media/MediaDrmBridge.java ('k') | media/base/key_system_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698