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

Commit e7f61b62 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Codec2BufferUtils.cpp: Fix integer-overflows" am: 3d0ae228 am: 06c7849b am: 9e71ffd4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1678367

Change-Id: I714461dfe6bef2e85d57866adfc291d318c4f82d
parents 1e5bd644 9e71ffd4

media/codec2/sfplugin/utils/Codec2BufferUtils.cpp

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

    return (img->mPlane[1].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) {
@@ -355,7 +355,7 @@ bool IsNV21(const MediaImage2 *img) { 
    }

    return (img->mPlane[1].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) {