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

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

Issue 1344133002: MediaCodecPlayer implementation - stage 7 (DRM) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mtplayer-drm-prepare
Patch Set: Renamed a variable Created 5 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
« no previous file with comments | « media/base/android/media_codec_video_decoder.cc ('k') | media/base/android/media_drm_bridge.cc » ('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) 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 <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 SessionExpirationUpdateCB session_expiration_update_cb_; 238 SessionExpirationUpdateCB session_expiration_update_cb_;
239 239
240 MediaCryptoReadyCB media_crypto_ready_cb_; 240 MediaCryptoReadyCB media_crypto_ready_cb_;
241 241
242 ResetCredentialsCB reset_credentials_cb_; 242 ResetCredentialsCB reset_credentials_cb_;
243 243
244 // The |player_tracker_| must be accessed by one thread only. It is accessed 244 // The |player_tracker_| must be accessed by one thread only. It is accessed
245 // by the Media thread when |use_media_thread_| is true. 245 // by the Media thread when |use_media_thread_| is true.
246 PlayerTrackerImpl player_tracker_; 246 PlayerTrackerImpl player_tracker_;
247 247
248 CdmPromiseAdapter cdm_promise_adapter_; 248 scoped_ptr<CdmPromiseAdapter> cdm_promise_adapter_;
249 249
250 // Object for posting tasks on UI thread. 250 // Object for posting tasks on UI thread.
251 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_; 251 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
252 252
253 // This flag is set when we use media thread for certain callbacks. 253 // This flag is set when we use media thread for certain callbacks.
254 const bool use_media_thread_; 254 const bool use_media_thread_;
255 255
256 // NOTE: Weak pointers must be invalidated before all other member variables. 256 // NOTE: Weak pointers must be invalidated before all other member variables.
257 base::WeakPtrFactory<MediaDrmBridge> media_weak_factory_; 257 base::WeakPtrFactory<MediaDrmBridge> media_weak_factory_;
258 base::WeakPtrFactory<MediaDrmBridge> ui_weak_factory_; 258 base::WeakPtrFactory<MediaDrmBridge> ui_weak_factory_;
259 259
260 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge); 260 DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
261 }; 261 };
262 262
263 } // namespace media 263 } // namespace media
264 264
265 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_ 265 #endif // MEDIA_BASE_ANDROID_MEDIA_DRM_BRIDGE_H_
OLDNEW
« no previous file with comments | « media/base/android/media_codec_video_decoder.cc ('k') | media/base/android/media_drm_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698