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

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 784493002: Encrypted Media: Rename NeedKey to EncryptedMediaInitData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 6 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 void OnKeyAdded(const std::string& session_id); 248 void OnKeyAdded(const std::string& session_id);
249 void OnKeyError(const std::string& session_id, 249 void OnKeyError(const std::string& session_id,
250 media::MediaKeys::KeyError error_code, 250 media::MediaKeys::KeyError error_code,
251 uint32 system_code); 251 uint32 system_code);
252 void OnKeyMessage(const std::string& session_id, 252 void OnKeyMessage(const std::string& session_id,
253 const std::vector<uint8>& message, 253 const std::vector<uint8>& message,
254 const GURL& destination_url); 254 const GURL& destination_url);
255 255
256 void OnMediaSourceOpened(blink::WebMediaSource* web_media_source); 256 void OnMediaSourceOpened(blink::WebMediaSource* web_media_source);
257 257
258 void OnNeedKey(const std::string& init_data_type, 258 void OnEncryptedMediaInitData(const std::string& init_data_type,
259 const std::vector<uint8>& init_data); 259 const std::vector<uint8>& init_data);
260 260
261 protected: 261 protected:
262 // Helper method to update the playing state. 262 // Helper method to update the playing state.
263 void UpdatePlayingState(bool is_playing_); 263 void UpdatePlayingState(bool is_playing_);
264 264
265 // Helper methods for posting task for setting states and update WebKit. 265 // Helper methods for posting task for setting states and update WebKit.
266 void UpdateNetworkState(blink::WebMediaPlayer::NetworkState state); 266 void UpdateNetworkState(blink::WebMediaPlayer::NetworkState state);
267 void UpdateReadyState(blink::WebMediaPlayer::ReadyState state); 267 void UpdateReadyState(blink::WebMediaPlayer::ReadyState state);
268 void TryCreateStreamTextureProxyIfNeeded(); 268 void TryCreateStreamTextureProxyIfNeeded();
269 void DoCreateStreamTexture(); 269 void DoCreateStreamTexture();
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 500
501 // NOTE: Weak pointers must be invalidated before all other member variables. 501 // NOTE: Weak pointers must be invalidated before all other member variables.
502 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 502 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
503 503
504 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 504 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
505 }; 505 };
506 506
507 } // namespace content 507 } // namespace content
508 508
509 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 509 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « content/renderer/media/android/media_source_delegate.cc ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698