[FFmpeg-cvslog] lavc/vvc: Use av_log2 when destination is integer

Frank Plowman git at videolan.org
Fri Jan 26 20:49:57 EET 2024


ffmpeg | branch: master | Frank Plowman <post at frankplowman.com> | Thu Jan 25 17:05:18 2024 +0000| [cb7b4ee02491662e0aeee26479e8add955cd9b43] | committer: James Almer

lavc/vvc: Use av_log2 when destination is integer

Signed-off-by: Frank Plowman <post at frankplowman.com>
Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavcodec/vvc/vvc_ctu.c | 4 ++--
 libavcodec/vvc/vvc_ps.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/vvc/vvc_ctu.c b/libavcodec/vvc/vvc_ctu.c
index 307bc3490e..d166b16a19 100644
--- a/libavcodec/vvc/vvc_ctu.c
+++ b/libavcodec/vvc/vvc_ctu.c
@@ -257,8 +257,8 @@ static TransformBlock* add_tb(TransformUnit *tu, VVCLocalContext *lc,
     tb->y0 = y0;
     tb->tb_width  = tb_width;
     tb->tb_height = tb_height;
-    tb->log2_tb_width  = log2(tb_width);
-    tb->log2_tb_height = log2(tb_height);
+    tb->log2_tb_width  = av_log2(tb_width);
+    tb->log2_tb_height = av_log2(tb_height);
 
     tb->max_scan_x = tb->max_scan_y = 0;
     tb->min_scan_x = tb->min_scan_y = 0;
diff --git a/libavcodec/vvc/vvc_ps.c b/libavcodec/vvc/vvc_ps.c
index ac96ed9f43..c2afc0ac93 100644
--- a/libavcodec/vvc/vvc_ps.c
+++ b/libavcodec/vvc/vvc_ps.c
@@ -910,7 +910,7 @@ static void scaling_derive(VVCScalingList *sl, const H266RawAPS *aps)
 {
     for (int id = 0; id < SL_MAX_ID; id++) {
         const int matrix_size   = derive_matrix_size(id);
-        const int log2_size     = log2(matrix_size);
+        const int log2_size     = av_log2(matrix_size);
         const int list_size     = matrix_size * matrix_size;
         int coeff[SL_MAX_MATRIX_SIZE * SL_MAX_MATRIX_SIZE];
         const uint8_t *pred;



More information about the ffmpeg-cvslog mailing list