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/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 1883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1894 cdm_ready_cb_ = cdm_ready_cb; | 1894 cdm_ready_cb_ = cdm_ready_cb; |
1895 | 1895 |
1896 if (cdm_context_) | 1896 if (cdm_context_) |
1897 SetCdmInternal(base::Bind(&media::IgnoreCdmAttached)); | 1897 SetCdmInternal(base::Bind(&media::IgnoreCdmAttached)); |
1898 } | 1898 } |
1899 | 1899 |
1900 bool WebMediaPlayerAndroid::supportsOverlayFullscreenVideo() { | 1900 bool WebMediaPlayerAndroid::supportsOverlayFullscreenVideo() { |
1901 return true; | 1901 return true; |
1902 } | 1902 } |
1903 | 1903 |
1904 void WebMediaPlayerAndroid::enterFullscreen() { | 1904 void WebMediaPlayerAndroid::enteredFullscreen() { |
1905 if (is_player_initialized_) | 1905 if (is_player_initialized_) |
1906 player_manager_->EnterFullscreen(player_id_); | 1906 player_manager_->EnterFullscreen(player_id_); |
1907 SetNeedsEstablishPeer(false); | 1907 SetNeedsEstablishPeer(false); |
1908 is_fullscreen_ = true; | 1908 is_fullscreen_ = true; |
1909 suppress_deleting_texture_ = false; | 1909 suppress_deleting_texture_ = false; |
1910 } | 1910 } |
1911 | 1911 |
1912 bool WebMediaPlayerAndroid::IsHLSStream() const { | 1912 bool WebMediaPlayerAndroid::IsHLSStream() const { |
1913 const GURL& url = redirected_url_.is_empty() ? url_ : redirected_url_; | 1913 const GURL& url = redirected_url_.is_empty() ? url_ : redirected_url_; |
1914 return media::MediaCodecUtil::IsHLSURL(url); | 1914 return media::MediaCodecUtil::IsHLSURL(url); |
(...skipping 20 matching lines...) Expand all Loading... |
1935 result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER; | 1935 result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER; |
1936 } else if (is_hls_url == is_hls) { | 1936 } else if (is_hls_url == is_hls) { |
1937 result = PREDICTION_RESULT_URL_BASED_WAS_BETTER; | 1937 result = PREDICTION_RESULT_URL_BASED_WAS_BETTER; |
1938 } | 1938 } |
1939 UMA_HISTOGRAM_ENUMERATION( | 1939 UMA_HISTOGRAM_ENUMERATION( |
1940 "Media.Android.IsHttpLiveStreamingMediaPredictionResult", | 1940 "Media.Android.IsHttpLiveStreamingMediaPredictionResult", |
1941 result, PREDICTION_RESULT_MAX); | 1941 result, PREDICTION_RESULT_MAX); |
1942 } | 1942 } |
1943 | 1943 |
1944 } // namespace content | 1944 } // namespace content |
OLD | NEW |