| OLD | NEW |
| 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_MEDIA_CODEC_BRIDGE_H_ | 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ |
| 6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ | 6 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <set> | 10 #include <set> |
| 11 #include <string> | 11 #include <string> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 15 #include "base/macros.h" |
| 15 #include "base/time/time.h" | 16 #include "base/time/time.h" |
| 16 #include "media/base/android/media_codec_util.h" | 17 #include "media/base/android/media_codec_util.h" |
| 17 #include "media/base/media_export.h" | 18 #include "media/base/media_export.h" |
| 18 | 19 |
| 19 namespace media { | 20 namespace media { |
| 20 | 21 |
| 21 struct SubsampleEntry; | 22 struct SubsampleEntry; |
| 22 | 23 |
| 23 // These must be in sync with MediaCodecBridge.MEDIA_CODEC_XXX constants in | 24 // These must be in sync with MediaCodecBridge.MEDIA_CODEC_XXX constants in |
| 24 // MediaCodecBridge.java. | 25 // MediaCodecBridge.java. |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 bool FillInputBuffer(int index, | 170 bool FillInputBuffer(int index, |
| 170 const uint8_t* data, | 171 const uint8_t* data, |
| 171 size_t data_size) WARN_UNUSED_RESULT; | 172 size_t data_size) WARN_UNUSED_RESULT; |
| 172 | 173 |
| 173 DISALLOW_COPY_AND_ASSIGN(MediaCodecBridge); | 174 DISALLOW_COPY_AND_ASSIGN(MediaCodecBridge); |
| 174 }; | 175 }; |
| 175 | 176 |
| 176 } // namespace media | 177 } // namespace media |
| 177 | 178 |
| 178 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ | 179 #endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ |
| OLD | NEW |