generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vp8_change_config: fix unsigned/signed comparison

Browse Source 
Use ~15 instead of 0x..F0

Cleans warning in Android build:
comparison of integers of different signs: 'unsigned int' and 'int'
if (((cm->Width + 15) & 0xfffffff0) !=
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~  ^
comparison of integers of different signs: 'unsigned int' and 'int'
((cm->Height + 15) & 0xfffffff0) !=
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~  ^

Change-Id: Iac25839cde3425b7b9db7f33740dc46a551b7546
This commit is contained in:
Johann
2016-06-10 18:09:04 -07:00
committed by Johann Koenig
parent 8767999493
commit db81c34336
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vp8/encoder/onyx_if.c
View File

@@ -1787,10 +1787,8 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
if (last_w != cpi->oxcf.Width || last_h != cpi->oxcf.Height) if (last_w != cpi->oxcf.Width || last_h != cpi->oxcf.Height)
cpi->force_next_frame_intra = 1; cpi->force_next_frame_intra = 1;
if (((cm->Width + 15) & 0xfffffff0) != if (((cm->Width + 15) & ~15) != cm->yv12_fb[cm->lst_fb_idx].y_width ||
cm->yv12_fb[cm->lst_fb_idx].y_width || ((cm->Height + 15) & ~15) != cm->yv12_fb[cm->lst_fb_idx].y_height ||
((cm->Height + 15) & 0xfffffff0) !=
cm->yv12_fb[cm->lst_fb_idx].y_height ||
cm->yv12_fb[cm->lst_fb_idx].y_width == 0) cm->yv12_fb[cm->lst_fb_idx].y_width == 0)
{ {
dealloc_raw_frame_buffers(cpi); dealloc_raw_frame_buffers(cpi);