diff options
| author | Ray Essick <essick@google.com> | 2021-03-18 16:50:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-18 16:50:29 +0000 |
| commit | 1c03d6e0d67cb8d7e6a99dfeca39842d26f3277b (patch) | |
| tree | abb869a430a8895b635ada25f2cb5b862b018bf6 | |
| parent | a0d5930fc24f46db503055e506bbc72c085cf9ce (diff) | |
| parent | 4a8f9e81f1a3a68997640901c9609ac4aea70f8b (diff) | |
Merge "m4v_h263: Add check on the encode dimension" into rvc-qpr-dev
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp b/media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp index 7ab8f451e7..30e4fda2df 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp @@ -491,6 +491,9 @@ OSCL_EXPORT_REF Bool PVInitVideoEncoder(VideoEncControls *encoderControl, Vid } for (i = 0; i < encParams->nLayers; i++) { + if (encOption->encHeight[i] == 0 || encOption->encWidth[i] == 0 || + encOption->encHeight[i] % 16 != 0 || encOption->encWidth[i] % 16 != 0) + goto CLEAN_UP; encParams->LayerHeight[i] = encOption->encHeight[i]; encParams->LayerWidth[i] = encOption->encWidth[i]; } |