diff options
| author | James Zern <jzern@google.com> | 2022-07-29 02:05:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-07-29 02:05:22 +0000 |
| commit | 59acf6739cbca60ea8cdb2abf4ab938eaf2abb46 (patch) | |
| tree | 3e8dea2fcaa1c9d47f13868c612278dd6154072d /vp9 | |
| parent | ce484db2110fc0a81f9d4e6c1a09d132e1e2b2b7 (diff) | |
| parent | 4667992d8ba51d60045d6fed705635a6455eb4f8 (diff) | |
| download | libvpx-59acf6739cbca60ea8cdb2abf4ab938eaf2abb46.tar libvpx-59acf6739cbca60ea8cdb2abf4ab938eaf2abb46.tar.gz libvpx-59acf6739cbca60ea8cdb2abf4ab938eaf2abb46.tar.bz2 libvpx-59acf6739cbca60ea8cdb2abf4ab938eaf2abb46.zip | |
Merge changes I0c6604ef,Id7e13b3d,I7291d9bd,Ic7c0a2e7,Ic7ce0fd9, ... into main
* changes:
x86: normalize type with _mm_cvtsi128_si32
vp9_filter_block_plane_non420: fix implicit conversion warnings
variance_avx2.c: fix implicit conversion warnings
vp8,read_mb_modes_mv: fix implicit conversion warnings
vp8_find_near_mvs: fix implicit conversion warnings
encode_test_driver: normalize frame_flags type
vp9,decoder_decode: fix ubsan null/zero offset warning
y4m_input_fetch_frame: fix ubsan null/zero offset warning
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_loopfilter.c | 2 | ||||
| -rw-r--r-- | vp9/vp9_dx_iface.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c index 95d6029f3..765cb1172 100644 --- a/vp9/common/vp9_loopfilter.c +++ b/vp9/common/vp9_loopfilter.c @@ -1180,7 +1180,7 @@ void vp9_filter_block_plane_non420(VP9_COMMON *cm, } // Disable filtering on the leftmost column - border_mask = ~(mi_col == 0 ? 1 : 0); + border_mask = ~(mi_col == 0 ? 1u : 0u); #if CONFIG_VP9_HIGHBITDEPTH if (cm->use_highbitdepth) { highbd_filter_selectively_vert( diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index 3c42c7dfe..bdfe21793 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -334,7 +334,6 @@ static vpx_codec_err_t decoder_decode(vpx_codec_alg_priv_t *ctx, const uint8_t *data, unsigned int data_sz, void *user_priv, long deadline) { const uint8_t *data_start = data; - const uint8_t *const data_end = data + data_sz; vpx_codec_err_t res; uint32_t frame_sizes[8]; int frame_count; @@ -362,6 +361,7 @@ static vpx_codec_err_t decoder_decode(vpx_codec_alg_priv_t *ctx, // Decode in serial mode. if (frame_count > 0) { + const uint8_t *const data_end = data + data_sz; int i; for (i = 0; i < frame_count; ++i) { @@ -379,6 +379,7 @@ static vpx_codec_err_t decoder_decode(vpx_codec_alg_priv_t *ctx, data_start += frame_size; } } else { + const uint8_t *const data_end = data + data_sz; while (data_start < data_end) { const uint32_t frame_size = (uint32_t)(data_end - data_start); const vpx_codec_err_t res = |