Merge M52: "When HLS redirects are encountered recreate WebMediaPlayer."

media/base/android/media_codec_util.h

 // Copyright 2015 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.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_UTIL_H_
 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_UTIL_H_
 
 #include <jni.h>
 #include <set>
 #include <string>
@@ skipping 48 matching lines @@
   // Get a list of encoder supported color formats for |mime_type|.
   // The mapping of color format name and its value refers to
   // MediaCodecInfo.CodecCapabilities.
   static std::set<int> GetEncoderColorFormats(const std::string& mime_type);
 
   // Returns true if |mime_type| is known to be unaccelerated (i.e. backed by a
   // software codec instead of a hardware one).
   static bool IsKnownUnaccelerated(const std::string& mime_type,
                                    MediaCodecDirection direction);
 
-  // Test whether the path of a URL ends with ".m3u8".
+  // Test whether a URL contains "m3u8". (Using exactly the same logic as
+  // NuPlayer does to determine if a stream is HLS.)
   static bool IsHLSURL(const GURL& url);
 
-  // Test whether a URL contains "m3u8". (Using exactly the same logic as
-  // NuPlayer does to determine if a stream is HLS.)
+  // Test whether the path of a URL ends with ".m3u8".
   static bool IsHLSPath(const GURL& url);
 
   static bool RegisterMediaCodecUtil(JNIEnv* env);
 
   // Indicates if the vp8 decoder or encoder is available on this device.
   static bool IsVp8DecoderAvailable();
   static bool IsVp8EncoderAvailable();
 
   // Indicates if the vp9 decoder is available on this device.
   static bool IsVp9DecoderAvailable();
 
   // Indicates if SurfaceView and MediaCodec work well together on this device.
   static bool IsSurfaceViewOutputSupported();
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_UTIL_H_