Switch to standard integer types in media/.

media/base/android/sdk_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/sdk_media_codec_bridge.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/strings/string_util.h"
 #include "jni/MediaCodecBridge_jni.h"
 #include "media/base/bit_reader.h"
 #include "media/base/decrypt_config.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
@@ skipping 274 matching lines @@
 bool SdkMediaCodecBridge::CopyFromOutputBuffer(int index,
                                                size_t offset,
                                                void* dst,
                                                int dst_size) {
   void* src_data = nullptr;
   size_t src_capacity = GetOutputBufferAddress(index, offset, &src_data);
   if (src_capacity < offset ||
       src_capacity - offset < static_cast<size_t>(dst_size)) {
     return false;
   }
-  memcpy(dst, static_cast<uint8*>(src_data) + offset, dst_size);
+  memcpy(dst, static_cast<uint8_t*>(src_data) + offset, dst_size);
   return true;
 }
 
 int SdkMediaCodecBridge::GetOutputBufferAddress(int index,
                                                 size_t offset,
                                                 void** addr) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_buffer(
       Java_MediaCodecBridge_getOutputBuffer(env, j_media_codec_.obj(), index));
   *addr =
-      reinterpret_cast<uint8*>(env->GetDirectBufferAddress(j_buffer.obj())) +
+      reinterpret_cast<uint8_t*>(env->GetDirectBufferAddress(j_buffer.obj())) +
       offset;
   return env->GetDirectBufferCapacity(j_buffer.obj()) - offset;
 }
 
 // static
 bool SdkMediaCodecBridge::RegisterSdkMediaCodecBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
@@ skipping 303 matching lines @@
   if (adaptive_playback_supported_for_testing_ == 0)
     return false;
   else if (adaptive_playback_supported_for_testing_ > 0)
     return true;
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaCodecBridge_isAdaptivePlaybackSupported(env, media_codec(),
                                                            width, height);
 }
 
 }  // namespace media