[FFmpeg-cvslog] lavc/vvc: Avoid overflow in coeff scale intermediate

Frank Plowman git at videolan.org
Tue Apr 9 17:44:46 EEST 2024


ffmpeg | branch: master | Frank Plowman <post at frankplowman.com> | Tue Apr  9 07:55:52 2024 +0000| [2b7e79e8905bc9dc0ee9c9a9e313f38c31de4b0a] | committer: Nuo Mi

lavc/vvc: Avoid overflow in coeff scale intermediate

Make intermediate result 64-bits to avoid an overflow before the right
shift.

Signed-off-by: Frank Plowman <post at frankplowman.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b7e79e8905bc9dc0ee9c9a9e313f38c31de4b0a
---

 libavcodec/vvc/intra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vvc/intra.c b/libavcodec/vvc/intra.c
index e515fb9710..5ac7d02c80 100644
--- a/libavcodec/vvc/intra.c
+++ b/libavcodec/vvc/intra.c
@@ -416,7 +416,7 @@ static const uint8_t* derive_scale_m(const VVCLocalContext *lc, const TransformB
 static av_always_inline int scale_coeff(const TransformBlock *tb, int coeff,
     const int scale, const int scale_m, const int log2_transform_range)
 {
-    coeff = (coeff * scale * scale_m + tb->bd_offset) >> tb->bd_shift;
+    coeff = ((int64_t) coeff * scale * scale_m + tb->bd_offset) >> tb->bd_shift;
     coeff = av_clip_intp2(coeff, log2_transform_range);
     return coeff;
 }



More information about the ffmpeg-cvslog mailing list