diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-05 22:44:53 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-05 22:44:53 +0000 |
| commit | 2cec19f85327e43d61742a13909f0cde1576c4ce (patch) | |
| tree | 9dc7eda76e9062d62516959971fe9fc73776b95e | |
| parent | 3bded78725de4f8d72ffcecac46bcc464dec9bd0 (diff) | |
| parent | 3d0d0ba034515b40793542069a81d10c7426c797 (diff) | |
| download | av-2cec19f85327e43d61742a13909f0cde1576c4ce.tar.gz | |
Snap for 11053320 from 3d0d0ba034515b40793542069a81d10c7426c797 to mainline-mediaprovider-releaseaml_mpr_341313030
Change-Id: If66f3507f9cbee8cfe36fb708c0ab5388444f4f5
| -rw-r--r-- | media/libstagefright/colorconversion/ColorConverter.cpp | 3 | ||||
| -rw-r--r-- | media/module/codecs/m4v_h263/dec/src/vop.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp index f91a8b29c2..854cc08fd6 100644 --- a/media/libstagefright/colorconversion/ColorConverter.cpp +++ b/media/libstagefright/colorconversion/ColorConverter.cpp @@ -1549,7 +1549,8 @@ status_t ColorConverter::convertYUV420Planar16ToY410( uint32_t u01, v01, y01, y23, y45, y67, uv0, uv1; size_t x = 0; - for (; x < src.cropWidth() - 3; x += 4) { + // x % 4 is always 0 so x + 3 will never overflow. + for (; x + 3 < src.cropWidth(); x += 4) { u01 = *((uint32_t*)ptr_u); ptr_u += 2; v01 = *((uint32_t*)ptr_v); ptr_v += 2; diff --git a/media/module/codecs/m4v_h263/dec/src/vop.cpp b/media/module/codecs/m4v_h263/dec/src/vop.cpp index abc086180d..2c937c31f1 100644 --- a/media/module/codecs/m4v_h263/dec/src/vop.cpp +++ b/media/module/codecs/m4v_h263/dec/src/vop.cpp @@ -136,6 +136,7 @@ PV_STATUS DecodeVOLHeader(VideoDecData *video, int layer) case 0x05: case 0x06: case 0x08: + case 0x09: case 0x10: case 0x11: case 0x12: |