From 58fad0bf141109f1aed820f4d57985c116e05b61 Mon Sep 17 00:00:00 2001 From: Ashok Bhat Date: Tue, 4 Mar 2014 21:13:52 +0000 Subject: Don't use size_t for variables that store uint32_t value The local variables width, height, displayWidth and displayHeight are set to the corresponding members of VideoFrame class. As the members of VideoFrame are uint32_t, the local variables have been changed to uint32_t. As these local variables are passed to a java method, the change of size_t to uint32_t ensures that the size of the actual parameter (i.e uint32_t) is now same as the size of the formal parameter (i.e. jint) for all platforms. Change-Id: Icd14de0142bfd4e6ba52a3e6aff3d80b323a0de4 Signed-off-by: Ashok Bhat --- media/jni/android_media_MediaMetadataRetriever.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media/jni/android_media_MediaMetadataRetriever.cpp b/media/jni/android_media_MediaMetadataRetriever.cpp index a52b24d..6176f0f 100644 --- a/media/jni/android_media_MediaMetadataRetriever.cpp +++ b/media/jni/android_media_MediaMetadataRetriever.cpp @@ -245,7 +245,7 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env, fields.createConfigMethod, SkBitmap::kRGB_565_Config); - size_t width, height; + uint32_t width, height; bool swapWidthAndHeight = false; if (videoFrame->mRotationAngle == 90 || videoFrame->mRotationAngle == 270) { width = videoFrame->mHeight; @@ -276,8 +276,8 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env, if (videoFrame->mDisplayWidth != videoFrame->mWidth || videoFrame->mDisplayHeight != videoFrame->mHeight) { - size_t displayWidth = videoFrame->mDisplayWidth; - size_t displayHeight = videoFrame->mDisplayHeight; + uint32_t displayWidth = videoFrame->mDisplayWidth; + uint32_t displayHeight = videoFrame->mDisplayHeight; if (swapWidthAndHeight) { displayWidth = videoFrame->mDisplayHeight; displayHeight = videoFrame->mDisplayWidth; -- cgit v1.1