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

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

Issue 1641993003: Pass media session id over IPC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@possible-next-split
Patch Set: Enumify constant Created 4 years, 9 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
11 #include "base/android/build_info.h" 11 #include "base/android/build_info.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/callback_helpers.h" 13 #include "base/callback_helpers.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/files/file_path.h" 15 #include "base/files/file_path.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/metrics/histogram.h" 17 #include "base/metrics/histogram.h"
18 #include "base/single_thread_task_runner.h" 18 #include "base/single_thread_task_runner.h"
19 #include "base/strings/string_number_conversions.h" 19 #include "base/strings/string_number_conversions.h"
20 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
21 #include "cc/blink/web_layer_impl.h" 21 #include "cc/blink/web_layer_impl.h"
22 #include "cc/layers/video_layer.h" 22 #include "cc/layers/video_layer.h"
23 #include "content/public/common/content_client.h" 23 #include "content/public/common/content_client.h"
24 #include "content/public/common/content_switches.h" 24 #include "content/public/common/content_switches.h"
25 #include "content/public/common/renderer_preferences.h" 25 #include "content/public/common/renderer_preferences.h"
26 #include "content/public/renderer/render_frame.h" 26 #include "content/public/renderer/render_frame.h"
27 #include "content/renderer/media/android/renderer_demuxer_android.h" 27 #include "content/renderer/media/android/renderer_demuxer_android.h"
28 #include "content/renderer/media/android/renderer_media_player_manager.h" 28 #include "content/renderer/media/android/renderer_media_player_manager.h"
29 #include "content/renderer/media/android/webmediasession_android.h"
29 #include "content/renderer/render_frame_impl.h" 30 #include "content/renderer/render_frame_impl.h"
30 #include "content/renderer/render_thread_impl.h" 31 #include "content/renderer/render_thread_impl.h"
31 #include "content/renderer/render_view_impl.h" 32 #include "content/renderer/render_view_impl.h"
32 #include "gpu/GLES2/gl2extchromium.h" 33 #include "gpu/GLES2/gl2extchromium.h"
33 #include "gpu/command_buffer/client/gles2_interface.h" 34 #include "gpu/command_buffer/client/gles2_interface.h"
34 #include "gpu/command_buffer/common/constants.h" 35 #include "gpu/command_buffer/common/constants.h"
35 #include "gpu/command_buffer/common/mailbox_holder.h" 36 #include "gpu/command_buffer/common/mailbox_holder.h"
36 #include "media/base/android/media_codec_util.h" 37 #include "media/base/android/media_codec_util.h"
37 #include "media/base/android/media_common_android.h" 38 #include "media/base/android/media_common_android.h"
38 #include "media/base/android/media_player_android.h" 39 #include "media/base/android/media_player_android.h"
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 delegate_(delegate), 189 delegate_(delegate),
189 delegate_id_(0), 190 delegate_id_(0),
190 defer_load_cb_(params.defer_load_cb()), 191 defer_load_cb_(params.defer_load_cb()),
191 buffered_(static_cast<size_t>(1)), 192 buffered_(static_cast<size_t>(1)),
192 media_task_runner_(params.media_task_runner()), 193 media_task_runner_(params.media_task_runner()),
193 ignore_metadata_duration_change_(false), 194 ignore_metadata_duration_change_(false),
194 pending_seek_(false), 195 pending_seek_(false),
195 seeking_(false), 196 seeking_(false),
196 did_loading_progress_(false), 197 did_loading_progress_(false),
197 player_manager_(player_manager), 198 player_manager_(player_manager),
199 media_session_id_(params.media_session()
200 ? static_cast<const WebMediaSessionAndroid*>(
201 params.media_session())
202 ->media_session_id()
203 : blink::WebMediaSession::DefaultID),
198 network_state_(WebMediaPlayer::NetworkStateEmpty), 204 network_state_(WebMediaPlayer::NetworkStateEmpty),
199 ready_state_(WebMediaPlayer::ReadyStateHaveNothing), 205 ready_state_(WebMediaPlayer::ReadyStateHaveNothing),
200 texture_id_(0), 206 texture_id_(0),
201 stream_id_(0), 207 stream_id_(0),
202 is_player_initialized_(false), 208 is_player_initialized_(false),
203 is_playing_(false), 209 is_playing_(false),
204 needs_establish_peer_(true), 210 needs_establish_peer_(true),
205 has_size_info_(false), 211 has_size_info_(false),
206 // Threaded compositing isn't enabled universally yet. 212 // Threaded compositing isn't enabled universally yet.
207 compositor_task_runner_(params.compositor_task_runner() 213 compositor_task_runner_(params.compositor_task_runner()
(...skipping 924 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 void WebMediaPlayerAndroid::InitializePlayer( 1138 void WebMediaPlayerAndroid::InitializePlayer(
1133 const GURL& url, 1139 const GURL& url,
1134 const GURL& first_party_for_cookies, 1140 const GURL& first_party_for_cookies,
1135 bool allow_stored_credentials, 1141 bool allow_stored_credentials,
1136 int demuxer_client_id) { 1142 int demuxer_client_id) {
1137 ReportHLSMetrics(); 1143 ReportHLSMetrics();
1138 1144
1139 allow_stored_credentials_ = allow_stored_credentials; 1145 allow_stored_credentials_ = allow_stored_credentials;
1140 player_manager_->Initialize( 1146 player_manager_->Initialize(
1141 player_type_, player_id_, url, first_party_for_cookies, demuxer_client_id, 1147 player_type_, player_id_, url, first_party_for_cookies, demuxer_client_id,
1142 frame_->document().url(), allow_stored_credentials, delegate_id_); 1148 frame_->document().url(), allow_stored_credentials, delegate_id_,
1149 media_session_id_);
1143 is_player_initialized_ = true; 1150 is_player_initialized_ = true;
1144 1151
1145 if (is_fullscreen_) 1152 if (is_fullscreen_)
1146 player_manager_->EnterFullscreen(player_id_); 1153 player_manager_->EnterFullscreen(player_id_);
1147 1154
1148 if (cdm_context_) 1155 if (cdm_context_)
1149 SetCdmInternal(base::Bind(&media::IgnoreCdmAttached)); 1156 SetCdmInternal(base::Bind(&media::IgnoreCdmAttached));
1150 } 1157 }
1151 1158
1152 void WebMediaPlayerAndroid::Pause(bool is_media_related_action) { 1159 void WebMediaPlayerAndroid::Pause(bool is_media_related_action) {
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
1657 result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER; 1664 result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER;
1658 } else if (is_hls_url == is_hls) { 1665 } else if (is_hls_url == is_hls) {
1659 result = PREDICTION_RESULT_URL_BASED_WAS_BETTER; 1666 result = PREDICTION_RESULT_URL_BASED_WAS_BETTER;
1660 } 1667 }
1661 UMA_HISTOGRAM_ENUMERATION( 1668 UMA_HISTOGRAM_ENUMERATION(
1662 "Media.Android.IsHttpLiveStreamingMediaPredictionResult", 1669 "Media.Android.IsHttpLiveStreamingMediaPredictionResult",
1663 result, PREDICTION_RESULT_MAX); 1670 result, PREDICTION_RESULT_MAX);
1664 } 1671 }
1665 1672
1666 } // namespace content 1673 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.h ('k') | content/renderer/media/android/webmediasession_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698