Implement fallback from WMPI to WMPA.

content/renderer/media/android/webmediaplayer_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/android/webmediaplayer_android.h"
 
 #include <stddef.h>
 
 #include <limits>
 
@@ skipping 148 matching lines @@
   }
 
  private:
   blink::WebGraphicsContext3D* web_graphics_context_;
 };
 
 }  // namespace
 
 namespace content {
 
+// static
+bool WebMediaPlayerAndroid::IsHLSPath(const GURL& url) {
+  if (!url.SchemeIsHTTPOrHTTPS() && !url.SchemeIsFile())
+    return false;
+
+  std::string path = url.path();
+  return base::EndsWith(path, ".m3u8", base::CompareCase::INSENSITIVE_ASCII);
+}
+
+// static
+bool WebMediaPlayerAndroid::IsHLSURL(const GURL& url) {
+  if (!url.SchemeIsHTTPOrHTTPS() && !url.SchemeIsFile())
+    return false;
+
+  std::string spec = url.spec();
+  if (base::EndsWith(spec, ".m3u8", base::CompareCase::INSENSITIVE_ASCII))
+    return true;
+  return (spec.find("m3u8") != std::string::npos);
+}
+
+

[watk, 2016/01/06 20:06:47]

extra newline or subtle style rule?

 WebMediaPlayerAndroid::WebMediaPlayerAndroid(
     blink::WebFrame* frame,
     blink::WebMediaPlayerClient* client,
     blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
     base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
     RendererMediaPlayerManager* player_manager,
     media::CdmFactory* cdm_factory,
     scoped_refptr<StreamTextureFactory> factory,
     int frame_id,
     const media::WebMediaPlayerParams& params)
@@ skipping 1742 matching lines @@
 }
 
 void WebMediaPlayerAndroid::enterFullscreen() {
   if (is_player_initialized_)
     player_manager_->EnterFullscreen(player_id_);
   SetNeedsEstablishPeer(false);
   is_fullscreen_ = true;
   suppress_deleting_texture_ = false;
 }
 
-// Test whether the path of a URL ends with '.m3u8'.
-static bool IsHLSPath(const GURL& url) {
-  if (!url.SchemeIsHTTPOrHTTPS() && !url.SchemeIsFile())
-    return false;
-
-  std::string path = url.path();
-  return base::EndsWith(path, ".m3u8", base::CompareCase::INSENSITIVE_ASCII);
-}
-
-// Predict whether NuPlayer will use HTTPLiveSource.
-static bool IsHLSURL(const GURL& url) {
-  if (!url.SchemeIsHTTPOrHTTPS() && !url.SchemeIsFile())
-    return false;
-
-  std::string spec = url.spec();
-  if (base::EndsWith(spec, ".m3u8", base::CompareCase::INSENSITIVE_ASCII))
-    return true;
-  return (spec.find("m3u8") != std::string::npos);
-}
-
 bool WebMediaPlayerAndroid::IsHLSStream() const {
   const GURL& url = redirected_url_.is_empty() ? url_ : redirected_url_;
   return IsHLSURL(url);
 }
 
 void WebMediaPlayerAndroid::ReportHLSMetrics() const {
   if (player_type_ != MEDIA_PLAYER_TYPE_URL)
     return;
 
   bool is_hls = IsHLSStream();
@@ skipping 13 matching lines @@
     result = PREDICTION_RESULT_PATH_BASED_WAS_BETTER;
   } else if (is_hls_url == is_hls) {
     result = PREDICTION_RESULT_URL_BASED_WAS_BETTER;
   }
   UMA_HISTOGRAM_ENUMERATION(
       "Media.Android.IsHttpLiveStreamingMediaPredictionResult",
       result, PREDICTION_RESULT_MAX);
 }
 
 }  // namespace content