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

Unified Diff: media/base/android/sdk_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/ndk_media_codec_bridge.cc ('k') | media/base/android/sdk_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/sdk_media_codec_bridge.h
diff --git a/media/base/android/sdk_media_codec_bridge.h b/media/base/android/sdk_media_codec_bridge.h
index 3518ad71c6f333812d648fb40cb21632c27d55c5..c495ffc93ff6a46cea7ab11f5f416157f7c29618 100644
--- a/media/base/android/sdk_media_codec_bridge.h
+++ b/media/base/android/sdk_media_codec_bridge.h
@@ -6,6 +6,8 @@
#define MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_
#include <jni.h>
+#include <stdint.h>
+
#include <set>
#include <string>
@@ -33,13 +35,13 @@ class MEDIA_EXPORT SdkMediaCodecBridge : 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,
@@ -60,7 +62,7 @@ class MEDIA_EXPORT SdkMediaCodecBridge : public MediaCodecBridge {
int GetOutputBuffersCount() override;
size_t GetOutputBuffersCapacity() override;
void GetInputBuffer(int input_buffer_index,
- uint8** data,
+ uint8_t** data,
size_t* capacity) override;
bool CopyFromOutputBuffer(int index,
size_t offset,
@@ -105,10 +107,10 @@ class MEDIA_EXPORT AudioCodecBridge : public SdkMediaCodecBridge {
bool ConfigureAndStart(const AudioCodec& codec,
int sample_rate,
int channel_count,
- const uint8* extra_data,
+ const uint8_t* extra_data,
size_t extra_data_size,
- int64 codec_delay_ns,
- int64 seek_preroll_ns,
+ int64_t codec_delay_ns,
+ int64_t seek_preroll_ns,
bool play_audio,
jobject media_crypto) WARN_UNUSED_RESULT;
@@ -120,10 +122,10 @@ class MEDIA_EXPORT AudioCodecBridge : public SdkMediaCodecBridge {
// When |postpone| is set to true, the next PlayOutputBuffer() should have
// postpone == false, and it will play two buffers: the postponed one and
// the one identified by |index|.
- int64 PlayOutputBuffer(int index,
- size_t size,
- size_t offset,
- bool postpone = false);
+ int64_t PlayOutputBuffer(int index,
+ size_t size,
+ size_t offset,
+ bool postpone = false);
// Set the volume of the audio output.
void SetVolume(double volume);
@@ -134,10 +136,10 @@ class MEDIA_EXPORT AudioCodecBridge : public SdkMediaCodecBridge {
// Configure the java MediaFormat object with the extra codec data passed in.
bool ConfigureMediaFormat(jobject j_format,
const AudioCodec& codec,
- const uint8* extra_data,
+ const uint8_t* extra_data,
size_t extra_data_size,
- int64 codec_delay_ns,
- int64 seek_preroll_ns);
+ int64_t codec_delay_ns,
+ int64_t seek_preroll_ns);
};
// Class for handling video encoding/decoding using android MediaCodec APIs.
« no previous file with comments | « media/base/android/ndk_media_codec_bridge.cc ('k') | media/base/android/sdk_media_codec_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698