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

2 files changed, 16 insertions, 16 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;
 }
diff --git a/video_engine/test/android/jni/android_media_codec_decoder.h b/video_engine/test/android/jni/android_media_codec_decoder.h
index 13707eb8..d8d560eb 100644
--- a/video_engine/test/android/jni/android_media_codec_decoder.h
+++ b/video_engine/test/android/jni/android_media_codec_decoder.h
@@ -27,8 +27,8 @@ class AndroidMediaCodecDecoder : public VideoDecoder {
   //          - numberOfCores     : Number of cores available for the decoder
   //
   // Return value                 : WEBRTC_VIDEO_CODEC_OK if OK, < 0 otherwise.
-  virtual WebRtc_Word32 InitDecode(
-      const VideoCodec* codecSettings, WebRtc_Word32 numberOfCores);
+  virtual int32_t InitDecode(
+      const VideoCodec* codecSettings, int32_t numberOfCores);
 
   // Decode encoded image (as a part of a video stream). The decoded image
   // will be returned to the user through the decode complete callback.
@@ -47,12 +47,12 @@ class AndroidMediaCodecDecoder : public VideoDecoder {
   //                                used by decoders with internal rendering.
   //
   // Return value                 : WEBRTC_VIDEO_CODEC_OK if OK, < 0 otherwise.
-  virtual WebRtc_Word32
+  virtual int32_t
   Decode(const EncodedImage& inputImage,
          bool missingFrames,
          const RTPFragmentationHeader* fragmentation,
          const CodecSpecificInfo* codecSpecificInfo = NULL,
-         WebRtc_Word64 renderTimeMs = -1);
+         int64_t renderTimeMs = -1);
 
   // Register an decode complete callback object.
   //
@@ -60,18 +60,18 @@ class AndroidMediaCodecDecoder : public VideoDecoder {
   //          - callback         : Callback object which handles decoded images.
   //
   // Return value                : WEBRTC_VIDEO_CODEC_OK if OK, < 0 otherwise.
-  virtual WebRtc_Word32 RegisterDecodeCompleteCallback(
+  virtual int32_t RegisterDecodeCompleteCallback(
       DecodedImageCallback* callback);
 
   // Free decoder memory.
   //
   // Return value                : WEBRTC_VIDEO_CODEC_OK if OK, < 0 otherwise.
-  virtual WebRtc_Word32 Release();
+  virtual int32_t Release();
 
   // Reset decoder state and prepare for a new call.
   //
   // Return value                : WEBRTC_VIDEO_CODEC_OK if OK, < 0 otherwise.
-  virtual WebRtc_Word32 Reset();
+  virtual int32_t Reset();
 
   // Codec configuration data sent out-of-band, i.e. in SIP call setup
   //
@@ -81,8 +81,8 @@ class AndroidMediaCodecDecoder : public VideoDecoder {
   //                               bytes
   //
   // Return value                : WEBRTC_VIDEO_CODEC_OK if OK, < 0 otherwise.
-  virtual WebRtc_Word32 SetCodecConfigParameters(
-      const WebRtc_UWord8* /*buffer*/, WebRtc_Word32 /*size*/) {
+  virtual int32_t SetCodecConfigParameters(
+      const uint8_t* /*buffer*/, int32_t /*size*/) {
     return WEBRTC_VIDEO_CODEC_ERROR;
   }