| OLD | NEW | 
|    1 // Copyright 2015 The Chromium Authors. All rights reserved. |    1 // Copyright 2015 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 "media/base/android/media_codec_util.h" |    5 #include "media/base/android/media_codec_util.h" | 
|    6  |    6  | 
|    7 #include <algorithm> |    7 #include <algorithm> | 
|    8  |    8  | 
|    9 #include "base/android/build_info.h" |    9 #include "base/android/build_info.h" | 
|   10 #include "base/android/jni_android.h" |   10 #include "base/android/jni_android.h" | 
|   11 #include "base/android/jni_array.h" |   11 #include "base/android/jni_array.h" | 
|   12 #include "base/android/jni_string.h" |   12 #include "base/android/jni_string.h" | 
|   13 #include "base/basictypes.h" |  | 
|   14 #include "base/logging.h" |   13 #include "base/logging.h" | 
|   15 #include "base/strings/string_util.h" |   14 #include "base/strings/string_util.h" | 
|   16 #include "jni/MediaCodecUtil_jni.h" |   15 #include "jni/MediaCodecUtil_jni.h" | 
|   17  |   16  | 
|   18 using base::android::AttachCurrentThread; |   17 using base::android::AttachCurrentThread; | 
|   19 using base::android::ConvertJavaStringToUTF8; |   18 using base::android::ConvertJavaStringToUTF8; | 
|   20 using base::android::ConvertUTF8ToJavaString; |   19 using base::android::ConvertUTF8ToJavaString; | 
|   21 using base::android::JavaIntArrayToIntVector; |   20 using base::android::JavaIntArrayToIntVector; | 
|   22 using base::android::ScopedJavaLocalRef; |   21 using base::android::ScopedJavaLocalRef; | 
|   23  |   22  | 
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  216   } |  215   } | 
|  217   return true; |  216   return true; | 
|  218 } |  217 } | 
|  219  |  218  | 
|  220 // static |  219 // static | 
|  221 bool MediaCodecUtil::RegisterMediaCodecUtil(JNIEnv* env) { |  220 bool MediaCodecUtil::RegisterMediaCodecUtil(JNIEnv* env) { | 
|  222   return RegisterNativesImpl(env); |  221   return RegisterNativesImpl(env); | 
|  223 } |  222 } | 
|  224  |  223  | 
|  225 }  // namespace media |  224 }  // namespace media | 
| OLD | NEW |