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

Unified Diff: webkit/renderer/media/android/webmediaplayer_android.h

Issue 16327002: android: Implement single origin and CORS check for video (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fetch media info in parallel. Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: webkit/renderer/media/android/webmediaplayer_android.h
diff --git a/webkit/renderer/media/android/webmediaplayer_android.h b/webkit/renderer/media/android/webmediaplayer_android.h
index ead17073e57a3642a7db0819fb382f59ea49faeb..36c84cd4d8bfc46cb01e2d868186a15a804a6cfe 100644
--- a/webkit/renderer/media/android/webmediaplayer_android.h
+++ b/webkit/renderer/media/android/webmediaplayer_android.h
@@ -24,6 +24,7 @@
#include "webkit/renderer/media/android/media_source_delegate.h"
#include "webkit/renderer/media/android/stream_texture_factory_android.h"
#include "webkit/renderer/media/crypto/proxy_decryptor.h"
+#include "webkit/renderer/media/media_info_loader.h"
namespace media {
class Demuxer;
@@ -243,7 +244,6 @@ class WebMediaPlayerAndroid
void SetNeedsEstablishPeer(bool needs_establish_peer);
void InitializeMediaPlayer(
- const WebKit::WebURL& url,
media::MediaPlayerAndroid::SourceType source_type);
#if defined(GOOGLE_TV)
@@ -253,6 +253,7 @@ class WebMediaPlayerAndroid
private:
void ReallocateVideoFrame();
+ void DidLoadMediaInfo(MediaInfoLoader::Status status);
// Actually do the work for generateKeyRequest/addKey so they can easily
// report results to UMA.
@@ -329,6 +330,10 @@ class WebMediaPlayerAndroid
// Whether the video size info is available.
bool has_size_info_;
+ // Whether the video metadata and info are available.
+ bool has_media_metadata_;
+ bool has_media_info_;
+
// Object for allocating stream textures.
scoped_ptr<StreamTextureFactory> stream_texture_factory_;
@@ -372,6 +377,8 @@ class WebMediaPlayerAndroid
media::MediaLog* media_log_;
MediaStreamClient* media_stream_client_;
+ scoped_ptr<MediaInfoLoader> info_loader_;
+
// The currently selected key system. Empty string means that no key system
// has been selected.
WebKit::WebString current_key_system_;

Powered by Google App Engine
This is Rietveld 408576698