diff mbox series

[FFmpeg-devel,4/6] nvdec_av1: Use av1dec force_integer_mv value

Message ID 20240427153034.990042-4-sw@jkqxz.net
State New
Headers show
Series [FFmpeg-devel,1/6] av1dec: Add force_integer_mv derived field for decoder use | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished

Commit Message

Mark Thompson April 27, 2024, 3:30 p.m. UTC 
---
 libavcodec/nvdec_av1.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Timo Rothenpieler May 6, 2024, 5:19 p.m. UTC | #1 
On 27.04.2024 17:30, Mark Thompson wrote:
> ---
>   libavcodec/nvdec_av1.c | 4 +---
>   1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/libavcodec/nvdec_av1.c b/libavcodec/nvdec_av1.c
> index 4efa420e66..8a46db1ed5 100644
> --- a/libavcodec/nvdec_av1.c
> +++ b/libavcodec/nvdec_av1.c
> @@ -106,9 +106,7 @@ static int nvdec_av1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u
>               .show_frame                   = frame_header->show_frame,
>               .disable_cdf_update           = frame_header->disable_cdf_update,
>               .allow_screen_content_tools   = frame_header->allow_screen_content_tools,
> -            .force_integer_mv             = frame_header->force_integer_mv ||
> -                                            frame_header->frame_type == AV1_FRAME_INTRA_ONLY ||
> -                                            frame_header->frame_type == AV1_FRAME_KEY,
> +            .force_integer_mv             = s->cur_frame.force_integer_mv;

that ";" should be a ","

Works fine with that fixed.

>               .coded_denom                  = frame_header->coded_denom,
>               .allow_intrabc                = frame_header->allow_intrabc,
>               .allow_high_precision_mv      = frame_header->allow_high_precision_mv,
Mark Thompson May 6, 2024, 7:30 p.m. UTC | #2 
On 06/05/2024 18:19, Timo Rothenpieler wrote:
> On 27.04.2024 17:30, Mark Thompson wrote:
>> ---
>>   libavcodec/nvdec_av1.c | 4 +---
>>   1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/libavcodec/nvdec_av1.c b/libavcodec/nvdec_av1.c
>> index 4efa420e66..8a46db1ed5 100644
>> --- a/libavcodec/nvdec_av1.c
>> +++ b/libavcodec/nvdec_av1.c
>> @@ -106,9 +106,7 @@ static int nvdec_av1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u
>>               .show_frame                   = frame_header->show_frame,
>>               .disable_cdf_update           = frame_header->disable_cdf_update,
>>               .allow_screen_content_tools   = frame_header->allow_screen_content_tools,
>> -            .force_integer_mv             = frame_header->force_integer_mv ||
>> -                                            frame_header->frame_type == AV1_FRAME_INTRA_ONLY ||
>> -                                            frame_header->frame_type == AV1_FRAME_KEY,
>> +            .force_integer_mv             = s->cur_frame.force_integer_mv;
> 
> that ";" should be a ","
> 
> Works fine with that fixed.

Urgh, thank you for testing and catching that.

Fixed and pushed the set (with approval from Lynne).

Thanks,

- Mark
diff mbox series

Patch

diff --git a/libavcodec/nvdec_av1.c b/libavcodec/nvdec_av1.c
index 4efa420e66..8a46db1ed5 100644
--- a/libavcodec/nvdec_av1.c
+++ b/libavcodec/nvdec_av1.c
@@ -106,9 +106,7 @@  static int nvdec_av1_start_frame(AVCodecContext *avctx, const uint8_t *buffer, u
             .show_frame                   = frame_header->show_frame,
             .disable_cdf_update           = frame_header->disable_cdf_update,
             .allow_screen_content_tools   = frame_header->allow_screen_content_tools,
-            .force_integer_mv             = frame_header->force_integer_mv ||
-                                            frame_header->frame_type == AV1_FRAME_INTRA_ONLY ||
-                                            frame_header->frame_type == AV1_FRAME_KEY,
+            .force_integer_mv             = s->cur_frame.force_integer_mv;
             .coded_denom                  = frame_header->coded_denom,
             .allow_intrabc                = frame_header->allow_intrabc,
             .allow_high_precision_mv      = frame_header->allow_high_precision_mv,