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

Unified Diff: media/base/android/ndk_media_codec_bridge.h

Issue 1499423004: Remove kint32max. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@kint9
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/media_codec_bridge.cc ('k') | media/base/android/ndk_media_codec_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/ndk_media_codec_bridge.h
diff --git a/media/base/android/ndk_media_codec_bridge.h b/media/base/android/ndk_media_codec_bridge.h
index 75bada9265afe32fccaf4815f5c2d644dd1d388a..d16d6f8eb40b56482a473f609ea0ef9eb1ccb6cf 100644
--- a/media/base/android/ndk_media_codec_bridge.h
+++ b/media/base/android/ndk_media_codec_bridge.h
@@ -6,6 +6,7 @@
#define MEDIA_BASE_ANDROID_NDK_MEDIA_CODEC_BRIDGE_H_
#include <media/NdkMediaCodec.h>
+#include <stdint.h>
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
@@ -27,13 +28,13 @@ class MEDIA_EXPORT NdkMediaCodecBridge : public MediaCodecBridge {
int GetOutputSamplingRate() override;
MediaCodecStatus QueueInputBuffer(
int index,
- const uint8* data,
+ const uint8_t* data,
size_t data_size,
const base::TimeDelta& presentation_time) override;
using MediaCodecBridge::QueueSecureInputBuffer;
MediaCodecStatus QueueSecureInputBuffer(
int index,
- const uint8* data,
+ const uint8_t* data,
size_t data_size,
const std::vector<char>& key_id,
const std::vector<char>& iv,
@@ -52,7 +53,7 @@ class MEDIA_EXPORT NdkMediaCodecBridge : public MediaCodecBridge {
bool* key_frame) override;
void ReleaseOutputBuffer(int index, bool render) override;
void GetInputBuffer(int input_buffer_index,
- uint8** data,
+ uint8_t** data,
size_t* capacity) override;
bool CopyFromOutputBuffer(int index,
size_t offset,
« no previous file with comments | « media/base/android/media_codec_bridge.cc ('k') | media/base/android/ndk_media_codec_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698