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

Unified Diff: content/renderer/media/webmediaplayer_proxy_impl_android.cc

Issue 14247018: Implement WebRTC in Chrome for TV (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: refactored according to Ami's suggestion Created 7 years, 7 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: content/renderer/media/webmediaplayer_proxy_impl_android.cc
diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.cc b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
index c129995950a185d35dc692be3f5914b51e19cdda..207af00da8fdbb2d690d047be18a45acf3ed39f2 100644
--- a/content/renderer/media/webmediaplayer_proxy_impl_android.cc
+++ b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
@@ -53,11 +53,15 @@ bool WebMediaPlayerProxyImplAndroid::OnMessageReceived(
}
void WebMediaPlayerProxyImplAndroid::Initialize(
- int player_id, const GURL& url,
- bool is_media_source,
+ int player_id,
+ const GURL& url,
+ media::MediaPlayerAndroid::MediaSourceType media_source_type,
const GURL& first_party_for_cookies) {
- Send(new MediaPlayerHostMsg_MediaPlayerInitialize(
- routing_id(), player_id, url, is_media_source, first_party_for_cookies));
+ Send(new MediaPlayerHostMsg_MediaPlayerInitialize(routing_id(),
+ player_id,
+ url,
+ media_source_type,
+ first_party_for_cookies));
}
void WebMediaPlayerProxyImplAndroid::Start(int player_id) {
@@ -205,6 +209,7 @@ void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck(
routing_id(), player_id, params));
}
+
void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer(
int player_id, media::DemuxerStream::Type type, bool seek_done) {
webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);

Powered by Google App Engine
This is Rietveld 408576698