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

Side by Side Diff: media/base/android/sdk_media_codec_bridge.h

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 4 years, 12 months 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
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 #ifndef MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <stddef.h>
9 #include <stdint.h> 10 #include <stdint.h>
10 11
11 #include <set> 12 #include <set>
12 #include <string> 13 #include <string>
13 14
14 #include "base/android/scoped_java_ref.h" 15 #include "base/android/scoped_java_ref.h"
15 #include "base/macros.h" 16 #include "base/macros.h"
16 #include "base/time/time.h" 17 #include "base/time/time.h"
17 #include "media/base/android/media_codec_bridge.h" 18 #include "media/base/android/media_codec_bridge.h"
18 #include "media/base/audio_decoder_config.h" 19 #include "media/base/audio_decoder_config.h"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 VideoCodecBridge(const std::string& mime, 190 VideoCodecBridge(const std::string& mime,
190 bool is_secure, 191 bool is_secure,
191 MediaCodecDirection direction); 192 MediaCodecDirection direction);
192 193
193 int adaptive_playback_supported_for_testing_; 194 int adaptive_playback_supported_for_testing_;
194 }; 195 };
195 196
196 } // namespace media 197 } // namespace media
197 198
198 #endif // MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_ 199 #endif // MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_
OLDNEW
« no previous file with comments | « media/base/android/ndk_media_codec_wrapper.cc ('k') | media/base/android/sdk_media_codec_bridge_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698