OLD | NEW |
---|---|
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/browser/media/android/browser_media_player_manager.h" | 5 #include "content/browser/media/android/browser_media_player_manager.h" |
6 | 6 |
7 #include "base/android/scoped_java_ref.h" | 7 #include "base/android/scoped_java_ref.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/metrics/histogram.h" | |
9 #include "content/browser/android/content_view_core_impl.h" | 10 #include "content/browser/android/content_view_core_impl.h" |
10 #include "content/browser/media/android/browser_demuxer_android.h" | 11 #include "content/browser/media/android/browser_demuxer_android.h" |
11 #include "content/browser/media/android/media_resource_getter_impl.h" | 12 #include "content/browser/media/android/media_resource_getter_impl.h" |
12 #include "content/browser/renderer_host/render_view_host_impl.h" | 13 #include "content/browser/renderer_host/render_view_host_impl.h" |
13 #include "content/browser/web_contents/web_contents_view_android.h" | 14 #include "content/browser/web_contents/web_contents_view_android.h" |
14 #include "content/common/media/media_player_messages_android.h" | 15 #include "content/common/media/media_player_messages_android.h" |
15 #include "content/public/browser/android/content_view_core.h" | 16 #include "content/public/browser/android/content_view_core.h" |
16 #include "content/public/browser/android/external_video_surface_container.h" | 17 #include "content/public/browser/android/external_video_surface_container.h" |
17 #include "content/public/browser/browser_context.h" | 18 #include "content/public/browser/browser_context.h" |
18 #include "content/public/browser/content_browser_client.h" | 19 #include "content/public/browser/content_browser_client.h" |
(...skipping 14 matching lines...) Expand all Loading... | |
33 using media::MediaPlayerBridge; | 34 using media::MediaPlayerBridge; |
34 using media::MediaPlayerManager; | 35 using media::MediaPlayerManager; |
35 using media::MediaSourcePlayer; | 36 using media::MediaSourcePlayer; |
36 | 37 |
37 namespace content { | 38 namespace content { |
38 | 39 |
39 // Threshold on the number of media players per renderer before we start | 40 // Threshold on the number of media players per renderer before we start |
40 // attempting to release inactive media players. | 41 // attempting to release inactive media players. |
41 const int kMediaPlayerThreshold = 1; | 42 const int kMediaPlayerThreshold = 1; |
42 | 43 |
44 enum MediaType { | |
45 NON_HTTP_LIVE_STREAM_TYPE = 0, | |
46 // Match the value in histograms.xml | |
47 HTTP_LIVE_STREAM_TYPE = 22, | |
48 }; | |
49 | |
43 static BrowserMediaPlayerManager::Factory g_factory = NULL; | 50 static BrowserMediaPlayerManager::Factory g_factory = NULL; |
44 static media::MediaUrlInterceptor* media_url_interceptor_ = NULL; | 51 static media::MediaUrlInterceptor* media_url_interceptor_ = NULL; |
45 | 52 |
46 // static | 53 // static |
47 void BrowserMediaPlayerManager::RegisterFactory(Factory factory) { | 54 void BrowserMediaPlayerManager::RegisterFactory(Factory factory) { |
48 g_factory = factory; | 55 g_factory = factory; |
49 } | 56 } |
50 | 57 |
51 // static | 58 // static |
52 void BrowserMediaPlayerManager::RegisterMediaUrlInterceptor( | 59 void BrowserMediaPlayerManager::RegisterMediaUrlInterceptor( |
(...skipping 11 matching lines...) Expand all Loading... | |
64 | 71 |
65 ContentViewCoreImpl* BrowserMediaPlayerManager::GetContentViewCore() const { | 72 ContentViewCoreImpl* BrowserMediaPlayerManager::GetContentViewCore() const { |
66 return ContentViewCoreImpl::FromWebContents(web_contents()); | 73 return ContentViewCoreImpl::FromWebContents(web_contents()); |
67 } | 74 } |
68 | 75 |
69 MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer( | 76 MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer( |
70 const MediaPlayerHostMsg_Initialize_Params& media_player_params, | 77 const MediaPlayerHostMsg_Initialize_Params& media_player_params, |
71 bool hide_url_log, | 78 bool hide_url_log, |
72 MediaPlayerManager* manager, | 79 MediaPlayerManager* manager, |
73 BrowserDemuxerAndroid* demuxer) { | 80 BrowserDemuxerAndroid* demuxer) { |
81 UMA_HISTOGRAM_BOOLEAN( | |
scherkus (not reviewing)
2014/08/28 19:07:28
any reason why we don't log these UMAs when WebMed
qinmin
2014/08/28 20:43:40
Done. Moved it to WMPA.
| |
82 "Media.MSE.Playback", | |
83 media_player_params.type == MEDIA_PLAYER_TYPE_MEDIA_SOURCE); | |
74 switch (media_player_params.type) { | 84 switch (media_player_params.type) { |
75 case MEDIA_PLAYER_TYPE_URL: { | 85 case MEDIA_PLAYER_TYPE_URL: { |
76 const std::string user_agent = GetContentClient()->GetUserAgent(); | 86 const std::string user_agent = GetContentClient()->GetUserAgent(); |
77 MediaPlayerBridge* media_player_bridge = new MediaPlayerBridge( | 87 MediaPlayerBridge* media_player_bridge = new MediaPlayerBridge( |
78 media_player_params.player_id, | 88 media_player_params.player_id, |
79 media_player_params.url, | 89 media_player_params.url, |
80 media_player_params.first_party_for_cookies, | 90 media_player_params.first_party_for_cookies, |
81 user_agent, | 91 user_agent, |
82 hide_url_log, | 92 hide_url_log, |
83 manager, | 93 manager, |
(...skipping 12 matching lines...) Expand all Loading... | |
96 // May reach here due to prerendering. Don't extract the metadata | 106 // May reach here due to prerendering. Don't extract the metadata |
97 // since it is expensive. | 107 // since it is expensive. |
98 // TODO(qinmin): extract the metadata once the user decided to load | 108 // TODO(qinmin): extract the metadata once the user decided to load |
99 // the page. | 109 // the page. |
100 browser_media_player_manager->OnMediaMetadataChanged( | 110 browser_media_player_manager->OnMediaMetadataChanged( |
101 media_player_params.player_id, base::TimeDelta(), 0, 0, false); | 111 media_player_params.player_id, base::TimeDelta(), 0, 0, false); |
102 } else if (!content_view_core_impl->ShouldBlockMediaRequest( | 112 } else if (!content_view_core_impl->ShouldBlockMediaRequest( |
103 media_player_params.url)) { | 113 media_player_params.url)) { |
104 media_player_bridge->Initialize(); | 114 media_player_bridge->Initialize(); |
105 } | 115 } |
116 std::string path = media_player_params.url.path(); | |
117 bool is_hls_media = EndsWith(path, ".m3u8", true) || | |
118 EndsWith(path, ".m3u", true); | |
119 MediaType media_type = is_hls_media ? HTTP_LIVE_STREAM_TYPE : | |
120 NON_HTTP_LIVE_STREAM_TYPE; | |
121 UMA_HISTOGRAM_ENUMERATION( | |
122 "Media.DetectedContainer", media_type, HTTP_LIVE_STREAM_TYPE + 1); | |
scherkus (not reviewing)
2014/08/28 19:07:28
to be honest I don't think it's worth reusing this
qinmin
2014/08/28 20:43:40
Done.
| |
106 return media_player_bridge; | 123 return media_player_bridge; |
107 } | 124 } |
108 | 125 |
109 case MEDIA_PLAYER_TYPE_MEDIA_SOURCE: { | 126 case MEDIA_PLAYER_TYPE_MEDIA_SOURCE: { |
110 return new MediaSourcePlayer( | 127 return new MediaSourcePlayer( |
111 media_player_params.player_id, | 128 media_player_params.player_id, |
112 manager, | 129 manager, |
113 base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested, | 130 base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested, |
114 weak_ptr_factory_.GetWeakPtr()), | 131 weak_ptr_factory_.GetWeakPtr()), |
115 base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesReleased, | 132 base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesReleased, |
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
586 #if defined(VIDEO_HOLE) | 603 #if defined(VIDEO_HOLE) |
587 MediaPlayerAndroid* player = GetPlayer(player_id); | 604 MediaPlayerAndroid* player = GetPlayer(player_id); |
588 if (player && player->IsSurfaceInUse()) | 605 if (player && player->IsSurfaceInUse()) |
589 return; | 606 return; |
590 if (external_video_surface_container_) | 607 if (external_video_surface_container_) |
591 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); | 608 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); |
592 #endif // defined(VIDEO_HOLE) | 609 #endif // defined(VIDEO_HOLE) |
593 } | 610 } |
594 | 611 |
595 } // namespace content | 612 } // namespace content |
OLD | NEW |