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

Side by Side Diff: media/base/android/ndk_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 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 #ifndef MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_ 5 #ifndef MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
6 #define MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_ 6 #define MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
7 7
8 #include <media/NdkMediaCodec.h> 8 #include <media/NdkMediaCodec.h>
9 #include <stddef.h>
9 #include <stdint.h> 10 #include <stdint.h>
10 11
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
13 #include "base/time/time.h" 14 #include "base/time/time.h"
14 #include "media/base/android/media_codec_bridge.h" 15 #include "media/base/android/media_codec_bridge.h"
15 #include "media/base/media_export.h" 16 #include "media/base/media_export.h"
16 17
17 namespace media { 18 namespace media {
18 19
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 }; 72 };
72 73
73 scoped_ptr<AMediaCodec, AMediaCodecDeleter> media_codec_; 74 scoped_ptr<AMediaCodec, AMediaCodecDeleter> media_codec_;
74 75
75 DISALLOW_COPY_AND_ASSIGN(NdkMediaCodecBridge); 76 DISALLOW_COPY_AND_ASSIGN(NdkMediaCodecBridge);
76 }; 77 };
77 78
78 } // namespace media 79 } // namespace media
79 80
80 #endif // MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_ 81 #endif // MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
OLDNEW
« no previous file with comments | « media/base/android/media_url_interceptor.h ('k') | media/base/android/ndk_media_codec_wrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698