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 #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 Loading... |
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_ |
OLD | NEW |