diff mbox series

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

Message ID 20240125170518.61211-1-post@frankplowman.com
State Accepted
Commit cb7b4ee02491662e0aeee26479e8add955cd9b43
Headers show
Series [FFmpeg-devel] lavc/vvc: Use av_log2 when destination is integer | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Frank Plowman Jan. 25, 2024, 5:05 p.m. UTC
From: Frank Plowman <post@frankplowman.com>

Signed-off-by: Frank Plowman <post@frankplowman.com>
---
 libavcodec/vvc/vvc_ctu.c | 4 ++--
 libavcodec/vvc/vvc_ps.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Nuo Mi Jan. 26, 2024, 4:43 a.m. UTC | #1
LGTM
On Fri, Jan 26, 2024 at 1:05 AM <post@frankplowman.com> wrote:

> From: Frank Plowman <post@frankplowman.com>
>
> Signed-off-by: Frank Plowman <post@frankplowman.com>
> ---
>  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;
> --
> 2.43.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
James Almer Jan. 26, 2024, 6:50 p.m. UTC | #2
On 1/26/2024 1:43 AM, Nuo Mi wrote:
> LGTM

Applied.

> On Fri, Jan 26, 2024 at 1:05 AM <post@frankplowman.com> wrote:
> 
>> From: Frank Plowman <post@frankplowman.com>
>>
>> Signed-off-by: Frank Plowman <post@frankplowman.com>
>> ---
>>   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;
diff mbox series

Patch

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;