diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-08-17 10:46:36 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-08-17 11:07:53 +0200 |
| commit | 444d80bd872e9dd718592173c23c88b3432bd53d (patch) | |
| tree | 3b7f20108b416068b4e46962d7aaeefa6664e39d | |
| parent | 1eaa575cf11c054b0b724480f3070fc908faf8ef (diff) | |
avcodec/me_cmp: Remove now incorrect av_assert2()
Since d69d12a5b9236b9d2f1fd247ea452f84cdd1aaf9 these av_assert2()
(or more exactly, the ones in hadamard8_diff8x8_c() and
hadamard8_intra8x8_c()) are hit. So just remove all of these asserts.
(If the test were improved to know which functions expect h == 8
and which support any value, the asserts could be readded
at the appropriate places.)
Reviewed-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/me_cmp.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c index fa82ae54ae..4242fbc6e4 100644 --- a/libavcodec/me_cmp.c +++ b/libavcodec/me_cmp.c @@ -558,8 +558,6 @@ static int hadamard8_diff8x8_c(MpegEncContext *s, const uint8_t *dst, { int i, temp[64], sum = 0; - av_assert2(h == 8); - for (i = 0; i < 8; i++) { // FIXME: try pointer walks BUTTERFLY2(temp[8 * i + 0], temp[8 * i + 1], @@ -610,8 +608,6 @@ static int hadamard8_intra8x8_c(MpegEncContext *s, const uint8_t *src, { int i, temp[64], sum = 0; - av_assert2(h == 8); - for (i = 0; i < 8; i++) { // FIXME: try pointer walks BUTTERFLY2(temp[8 * i + 0], temp[8 * i + 1], @@ -662,8 +658,6 @@ static int dct_sad8x8_c(MpegEncContext *s, const uint8_t *src1, { LOCAL_ALIGNED_16(int16_t, temp, [64]); - av_assert2(h == 8); - s->pdsp.diff_pixels_unaligned(temp, src1, src2, stride); s->fdsp.fdct(temp); return s->mecc.sum_abs_dctelem(temp); @@ -729,8 +723,6 @@ static int dct_max8x8_c(MpegEncContext *s, const uint8_t *src1, LOCAL_ALIGNED_16(int16_t, temp, [64]); int sum = 0, i; - av_assert2(h == 8); - s->pdsp.diff_pixels_unaligned(temp, src1, src2, stride); s->fdsp.fdct(temp); @@ -747,7 +739,6 @@ static int quant_psnr8x8_c(MpegEncContext *s, const uint8_t *src1, int16_t *const bak = temp + 64; int sum = 0, i; - av_assert2(h == 8); s->mb_intra = 0; s->pdsp.diff_pixels_unaligned(temp, src1, src2, stride); @@ -776,8 +767,6 @@ static int rd8x8_c(MpegEncContext *s, const uint8_t *src1, const uint8_t *src2, const int esc_length = s->ac_esc_length; uint8_t *length, *last_length; - av_assert2(h == 8); - copy_block8(lsrc1, src1, 8, stride, 8); copy_block8(lsrc2, src2, 8, stride, 8); @@ -851,8 +840,6 @@ static int bit8x8_c(MpegEncContext *s, const uint8_t *src1, const uint8_t *src2, const int esc_length = s->ac_esc_length; uint8_t *length, *last_length; - av_assert2(h == 8); - s->pdsp.diff_pixels_unaligned(temp, src1, src2, stride); s->block_last_index[0 /* FIXME */] = |