Fix wrong result from IsKnownUnaccelerated() even if there are H/W acceleratable codecs.

media/base/android/media_codec_bridge.cc

 // Copyright (c) 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 "media/base/android/media_codec_bridge.h"
 
 #include <jni.h>
 #include <string>
 
 #include "base/android/build_info.h"
@@ skipping 149 matching lines @@
   }
   return false;
 }
 
 // static
 bool MediaCodecBridge::IsKnownUnaccelerated(const std::string& mime_type,
                                             MediaCodecDirection direction) {
   if (!IsAvailable())
     return true;
 
+  bool IsKnownUnaccelerated = true;

[DaleCurtis, 2014/06/20 18:00:31]

revert.

[KhNo, 2014/06/21 15:29:15]

Done.

+
   std::string codec_type = AndroidMimeTypeToCodecType(mime_type);
   std::vector<media::MediaCodecBridge::CodecsInfo> codecs_info =
       MediaCodecBridge::GetCodecsInfo();
   for (size_t i = 0; i < codecs_info.size(); ++i) {
     if (codecs_info[i].codecs == codec_type &&
         codecs_info[i].direction == direction) {
       // It would be nice if MediaCodecInfo externalized some notion of
       // HW-acceleration but it doesn't. Android Media guidance is that the
       // prefix below is always used for SW decoders, so that's what we use.
-      return StartsWithASCII(codecs_info[i].name, "OMX.google.", true);
+      if (!StartsWithASCII(codecs_info[i].name, "OMX.google.", true))
+        IsKnownUnaccelerated = false;

[DaleCurtis, 2014/06/20 18:00:31]

Just change this to "if (!...) return false;"

[KhNo, 2014/06/21 15:29:15]

Thanks DaleCurtis.

     }
   }
-  return true;
+  return IsKnownUnaccelerated;

[DaleCurtis, 2014/06/20 18:00:31]

revert.

[KhNo, 2014/06/21 15:29:15]

Done.

 }
 
 MediaCodecBridge::MediaCodecBridge(const std::string& mime,
                                    bool is_secure,
                                    MediaCodecDirection direction) {
   JNIEnv* env = AttachCurrentThread();
   CHECK(env);
   DCHECK(!mime.empty());
   ScopedJavaLocalRef<jstring> j_mime = ConvertUTF8ToJavaString(env, mime);
   j_media_codec_.Reset(
@@ skipping 544 matching lines @@
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaCodecBridge_isAdaptivePlaybackSupported(
       env, media_codec(), width, height);
 }
 
 bool MediaCodecBridge::RegisterMediaCodecBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace media