Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae7cd06 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am f2c11c14: am 214c3d9b: am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t... 

am f2c11c14: am 214c3d9b: am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value"

* commit 'f2c11c14':
  Don't use size_t for variables that store uint32_t value
parents 11d9e512 f2c11c14

media/jni/android_media_MediaMetadataRetriever.cpp

+3 −3
Original line number Diff line number Diff line
@@ -256,7 +256,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;
@@ -287,8 +287,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;