summaryrefslogtreecommitdiff
path: root/video_engine/test/android/jni/android_media_codec_decoder.cc
diff options
context:
space:
mode:
authorpbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-04-09 13:41:51 +0000
committerpbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2013-04-09 13:41:51 +0000
commit67879bc2e69d7907b7ceb92135a34f77fe643e7f (patch)
tree358714027896d78b274ee02da9dc6f188af4028d /video_engine/test/android/jni/android_media_codec_decoder.cc
parentc57ef84a298c25d213c1a0e262253a6a91d2b685 (diff)
downloadwebrtc-67879bc2e69d7907b7ceb92135a34f77fe643e7f.tar.gz
WebRtc_Word32 -> int32_t in video_engine/
BUG=314 Review URL: https://webrtc-codereview.appspot.com/1302005 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3801 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/test/android/jni/android_media_codec_decoder.cc')
-rw-r--r--video_engine/test/android/jni/android_media_codec_decoder.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/video_engine/test/android/jni/android_media_codec_decoder.cc b/video_engine/test/android/jni/android_media_codec_decoder.cc
index 0e2ec50f..ac12015c 100644
--- a/video_engine/test/android/jni/android_media_codec_decoder.cc
+++ b/video_engine/test/android/jni/android_media_codec_decoder.cc
@@ -29,8 +29,8 @@ AndroidMediaCodecDecoder::AndroidMediaCodecDecoder(
vm_attached_(false) {
}
-WebRtc_Word32 AndroidMediaCodecDecoder::InitDecode(
- const VideoCodec* codecSettings, WebRtc_Word32 numberOfCores) {
+int32_t AndroidMediaCodecDecoder::InitDecode(
+ const VideoCodec* codecSettings, int32_t numberOfCores) {
__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, "%s", __func__);
// TODO(dwkang): Detach this thread from VM. => this leads to a crash on
@@ -64,12 +64,12 @@ WebRtc_Word32 AndroidMediaCodecDecoder::InitDecode(
return WEBRTC_VIDEO_CODEC_OK;
}
-WebRtc_Word32 AndroidMediaCodecDecoder::Decode(
+int32_t AndroidMediaCodecDecoder::Decode(
const EncodedImage& inputImage,
bool missingFrames,
const RTPFragmentationHeader* fragmentation,
const CodecSpecificInfo* codecSpecificInfo,
- WebRtc_Word64 renderTimeMs) {
+ int64_t renderTimeMs) {
if (!vm_attached_) {
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
}
@@ -83,13 +83,13 @@ WebRtc_Word32 AndroidMediaCodecDecoder::Decode(
return WEBRTC_VIDEO_CODEC_NO_OUTPUT;
}
-WebRtc_Word32 AndroidMediaCodecDecoder::RegisterDecodeCompleteCallback(
+int32_t AndroidMediaCodecDecoder::RegisterDecodeCompleteCallback(
DecodedImageCallback* callback) {
__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, "%s", __func__);
return WEBRTC_VIDEO_CODEC_OK;
}
-WebRtc_Word32 AndroidMediaCodecDecoder::Release() {
+int32_t AndroidMediaCodecDecoder::Release() {
__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, "%s", __func__);
env_->DeleteGlobalRef(mediaCodecDecoder_);
mediaCodecDecoder_ = NULL;
@@ -97,7 +97,7 @@ WebRtc_Word32 AndroidMediaCodecDecoder::Release() {
return WEBRTC_VIDEO_CODEC_OK;
}
-WebRtc_Word32 AndroidMediaCodecDecoder::Reset() {
+int32_t AndroidMediaCodecDecoder::Reset() {
__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, "%s", __func__);
return WEBRTC_VIDEO_CODEC_OK;
}