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

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

Issue 1567123002: Support CAST+WMPI on android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 4 years, 11 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 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 #include "content/renderer/media/android/webmediaplayer_android.h" 5 #include "content/renderer/media/android/webmediaplayer_android.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 10
(...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after
1117 1117
1118 void WebMediaPlayerAndroid::InitializePlayer( 1118 void WebMediaPlayerAndroid::InitializePlayer(
1119 const GURL& url, 1119 const GURL& url,
1120 const GURL& first_party_for_cookies, 1120 const GURL& first_party_for_cookies,
1121 bool allow_stored_credentials, 1121 bool allow_stored_credentials,
1122 int demuxer_client_id) { 1122 int demuxer_client_id) {
1123 ReportHLSMetrics(); 1123 ReportHLSMetrics();
1124 1124
1125 allow_stored_credentials_ = allow_stored_credentials; 1125 allow_stored_credentials_ = allow_stored_credentials;
1126 player_manager_->Initialize( 1126 player_manager_->Initialize(
1127 player_type_, player_id_, url, first_party_for_cookies, demuxer_client_id, 1127 static_cast<media::MediaPlayerHostMsg_Initialize_Type>(player_type_),
1128 player_id_, url, first_party_for_cookies, demuxer_client_id,
1128 frame_->document().url(), allow_stored_credentials); 1129 frame_->document().url(), allow_stored_credentials);
1129 is_player_initialized_ = true; 1130 is_player_initialized_ = true;
1130 1131
1131 if (is_fullscreen_) 1132 if (is_fullscreen_)
1132 player_manager_->EnterFullscreen(player_id_); 1133 player_manager_->EnterFullscreen(player_id_);
1133 1134
1134 if (cdm_context_) 1135 if (cdm_context_)
1135 SetCdmInternal(base::Bind(&media::IgnoreCdmAttached)); 1136 SetCdmInternal(base::Bind(&media::IgnoreCdmAttached));
1136 } 1137 }
1137 1138
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
1974 result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER; 1975 result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER;
1975 } else if (is_hls_url == is_hls) { 1976 } else if (is_hls_url == is_hls) {
1976 result = PREDICTION_RESULT_URL_BASED_WAS_BETTER; 1977 result = PREDICTION_RESULT_URL_BASED_WAS_BETTER;
1977 } 1978 }
1978 UMA_HISTOGRAM_ENUMERATION( 1979 UMA_HISTOGRAM_ENUMERATION(
1979 "Media.Android.IsHttpLiveStreamingMediaPredictionResult", 1980 "Media.Android.IsHttpLiveStreamingMediaPredictionResult",
1980 result, PREDICTION_RESULT_MAX); 1981 result, PREDICTION_RESULT_MAX);
1981 } 1982 }
1982 1983
1983 } // namespace content 1984 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698