Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: media/base/android/media_drm_bridge.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/base/android/media_drm_bridge.h ('k') | media/base/android/media_drm_bridge_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_drm_bridge.h" 5 #include "media/base/android/media_drm_bridge.h"
6 6
7 #include <stddef.h>
8
7 #include <algorithm> 9 #include <algorithm>
8 10
9 #include "base/android/build_info.h" 11 #include "base/android/build_info.h"
10 #include "base/android/jni_array.h" 12 #include "base/android/jni_array.h"
11 #include "base/android/jni_string.h" 13 #include "base/android/jni_string.h"
12 #include "base/bind.h" 14 #include "base/bind.h"
13 #include "base/callback_helpers.h" 15 #include "base/callback_helpers.h"
14 #include "base/containers/hash_tables.h" 16 #include "base/containers/hash_tables.h"
15 #include "base/lazy_instance.h" 17 #include "base/lazy_instance.h"
16 #include "base/location.h" 18 #include "base/location.h"
17 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/macros.h"
18 #include "base/single_thread_task_runner.h" 21 #include "base/single_thread_task_runner.h"
19 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
20 #include "base/strings/string_util.h" 23 #include "base/strings/string_util.h"
21 #include "base/sys_byteorder.h" 24 #include "base/sys_byteorder.h"
22 #include "base/sys_info.h" 25 #include "base/sys_info.h"
23 #include "base/thread_task_runner_handle.h" 26 #include "base/thread_task_runner_handle.h"
24 #include "jni/MediaDrmBridge_jni.h" 27 #include "jni/MediaDrmBridge_jni.h"
25 #include "media/base/android/media_client_android.h" 28 #include "media/base/android/media_client_android.h"
26 #include "media/base/android/media_drm_bridge_delegate.h" 29 #include "media/base/android/media_drm_bridge_delegate.h"
27 #include "media/base/android/provision_fetcher.h" 30 #include "media/base/android/provision_fetcher.h"
(...skipping 796 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 JNIEnv* env = AttachCurrentThread(); 827 JNIEnv* env = AttachCurrentThread();
825 828
826 ScopedJavaLocalRef<jbyteArray> j_response = base::android::ToJavaByteArray( 829 ScopedJavaLocalRef<jbyteArray> j_response = base::android::ToJavaByteArray(
827 env, reinterpret_cast<const uint8_t*>(response.data()), response.size()); 830 env, reinterpret_cast<const uint8_t*>(response.data()), response.size());
828 831
829 Java_MediaDrmBridge_processProvisionResponse(env, j_media_drm_.obj(), success, 832 Java_MediaDrmBridge_processProvisionResponse(env, j_media_drm_.obj(), success,
830 j_response.obj()); 833 j_response.obj());
831 } 834 }
832 835
833 } // namespace media 836 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_drm_bridge.h ('k') | media/base/android/media_drm_bridge_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698