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

Unified Diff: media/base/android/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
Index: media/base/android/media_codec_bridge.h
diff --git a/media/base/android/media_codec_bridge.h b/media/base/android/media_codec_bridge.h
index 73f070d81de9cb44542d0d050c6f0d71c6c46e0d..f11b3c7ed3eccb3aab1c5e4eaba4827bb1e1977f 100644
--- a/media/base/android/media_codec_bridge.h
+++ b/media/base/android/media_codec_bridge.h
@@ -6,6 +6,8 @@
#define MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_
#include <jni.h>
+#include <stdint.h>
+
#include <set>
#include <string>
@@ -117,7 +119,7 @@ class MEDIA_EXPORT MediaCodecBridge {
// input buffer has already been populated (but still obey |size|).
// |data_size| must be less than kint32max (because Java).
MediaCodecStatus QueueInputBuffer(int index,
- const uint8* data,
+ const uint8_t* data,
size_t data_size,
const base::TimeDelta& presentation_time);
@@ -127,7 +129,7 @@ class MEDIA_EXPORT MediaCodecBridge {
// |data_size|). |data_size| must be less than kint32max (because Java).
MediaCodecStatus QueueSecureInputBuffer(
int index,
- const uint8* data,
+ const uint8_t* data,
size_t data_size,
const std::string& key_id,
const std::string& iv,
@@ -140,11 +142,11 @@ class MEDIA_EXPORT MediaCodecBridge {
// switch to the Spitzer pipeline.
MediaCodecStatus QueueSecureInputBuffer(
int index,
- const uint8* data,
+ const uint8_t* data,
size_t data_size,
- const uint8* key_id,
+ const uint8_t* key_id,
int key_id_size,
- const uint8* iv,
+ const uint8_t* iv,
int iv_size,
const SubsampleEntry* subsamples,
int subsamples_size,
@@ -192,7 +194,7 @@ class MEDIA_EXPORT MediaCodecBridge {
size_t GetOutputBuffersCapacity();
// Returns an input buffer's base pointer and capacity.
- void GetInputBuffer(int input_buffer_index, uint8** data, size_t* capacity);
+ void GetInputBuffer(int input_buffer_index, uint8_t** data, size_t* capacity);
// Copy |dst_size| bytes from output buffer |index|'s |offset| onwards into
// |*dst|.
@@ -227,7 +229,7 @@ class MEDIA_EXPORT MediaCodecBridge {
// Fills a particular input buffer; returns false if |data_size| exceeds the
// input buffer's capacity (and doesn't touch the input buffer in that case).
bool FillInputBuffer(int index,
- const uint8* data,
+ const uint8_t* data,
size_t data_size) WARN_UNUSED_RESULT;
// Java MediaCodec instance.
@@ -246,10 +248,15 @@ class AudioCodecBridge : public MediaCodecBridge {
static bool IsKnownUnaccelerated(const AudioCodec& codec);
// Start the audio codec bridge.
- bool Start(const AudioCodec& codec, int sample_rate, int channel_count,
- const uint8* extra_data, size_t extra_data_size,
- int64 codec_delay_ns, int64 seek_preroll_ns,
- bool play_audio, jobject media_crypto) WARN_UNUSED_RESULT;
+ bool Start(const AudioCodec& codec,
+ int sample_rate,
+ int channel_count,
+ const uint8_t* extra_data,
+ size_t extra_data_size,
+ int64_t codec_delay_ns,
+ int64_t seek_preroll_ns,
+ bool play_audio,
+ jobject media_crypto) WARN_UNUSED_RESULT;
// Plays the output buffer right away or save for later playback if |postpone|
// is set to true. This call must be called after DequeueOutputBuffer() and
@@ -259,10 +266,10 @@ class AudioCodecBridge : public MediaCodecBridge {
// 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);
@@ -271,9 +278,12 @@ class AudioCodecBridge : public MediaCodecBridge {
explicit AudioCodecBridge(const std::string& mime);
// Configure the java MediaFormat object with the extra codec data passed in.
- bool ConfigureMediaFormat(jobject j_format, const AudioCodec& codec,
- const uint8* extra_data, size_t extra_data_size,
- int64 codec_delay_ns, int64 seek_preroll_ns);
+ bool ConfigureMediaFormat(jobject j_format,
+ const AudioCodec& codec,
+ const uint8_t* extra_data,
+ size_t extra_data_size,
+ int64_t codec_delay_ns,
+ int64_t seek_preroll_ns);
};
class MEDIA_EXPORT VideoCodecBridge : public MediaCodecBridge {

Powered by Google App Engine
This is Rietveld 408576698