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

Commit 3d0ae228 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Codec2BufferUtils.cpp: Fix integer-overflows"

parents ed2e669b cd59f03d

media/codec2/sfplugin/utils/Codec2BufferUtils.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -346,7 +346,7 @@ bool IsNV12(const MediaImage2 *img) { 
    }

    }

    return (img->mPlane[1].mColInc == 2

    return (img->mPlane[1].mColInc == 2

            && img->mPlane[2].mColInc == 2

            && img->mPlane[2].mColInc == 2

            && (img->mPlane[2].mOffset - img->mPlane[1].mOffset == 1));

            && (img->mPlane[2].mOffset == img->mPlane[1].mOffset + 1));

}

}





bool IsNV21(const MediaImage2 *img) {

bool IsNV21(const MediaImage2 *img) {
@@ -355,7 +355,7 @@ bool IsNV21(const MediaImage2 *img) { 
    }

    }

    return (img->mPlane[1].mColInc == 2

    return (img->mPlane[1].mColInc == 2

            && img->mPlane[2].mColInc == 2

            && img->mPlane[2].mColInc == 2

            && (img->mPlane[1].mOffset - img->mPlane[2].mOffset == 1));

            && (img->mPlane[1].mOffset == img->mPlane[2].mOffset + 1));

}

}





bool IsI420(const MediaImage2 *img) {

bool IsI420(const MediaImage2 *img) {