const correctness, validPixel test.

- made width(), height() const member functions.
- added validPixel() which returns true if pixel is in the allowed range.
- now testing validPixel in get/setPixelValue

Change-Id: I1dee5060bd4f8dcbdcd542ec4647ea328f0185c3

1 files changed, 9 insertions, 0 deletions

diff --git a/media/libstagefright/yuv/YUVImage.cpp b/media/libstagefright/yuv/YUVImage.cpp
index 73e3297..b712062 100644
--- a/media/libstagefright/yuv/YUVImage.cpp
+++ b/media/libstagefright/yuv/YUVImage.cpp
@@ -155,8 +155,15 @@ bool YUVImage::getYUVAddresses(int32_t x, int32_t y,
     return true;
 }
 
+bool YUVImage::validPixel(int32_t x, int32_t y) const {
+    return (x >= 0 && x < mWidth &&
+            y >= 0 && y < mHeight);
+}
+
 bool YUVImage::getPixelValue(int32_t x, int32_t y,
         uint8_t *yPtr, uint8_t *uPtr, uint8_t *vPtr) const {
+    CHECK(validPixel(x, y));
+
     uint8_t *yAddr;
     uint8_t *uAddr;
     uint8_t *vAddr;
@@ -171,6 +178,8 @@ bool YUVImage::getPixelValue(int32_t x, int32_t y,
 
 bool YUVImage::setPixelValue(int32_t x, int32_t y,
         uint8_t yValue, uint8_t uValue, uint8_t vValue) {
+    CHECK(validPixel(x, y));
+
     uint8_t *yAddr;
     uint8_t *uAddr;
     uint8_t *vAddr;