diff mbox series

[FFmpeg-devel] avcodec/libsvtav1: add version guard for external param

Message ID 20231108045534.1529-1-ffmpeg@gyani.pro
State Accepted
Commit 67a2571a5547d39990e7f709f24d7a5b452ff8b9
Headers show
Series [FFmpeg-devel] avcodec/libsvtav1: add version guard for external param | 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

Gyan Doshi Nov. 8, 2023, 4:55 a.m. UTC 
Setting of external param 'force_key_frames' was added in 7bcc1b4eb8.
It is available since v1.1.0 but ffmpeg allows linking against v0.9.0.
---
 libavcodec/libsvtav1.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Gyan Doshi Nov. 12, 2023, 2:57 p.m. UTC | #1 
On 2023-11-08 10:25 am, Gyan Doshi wrote:
> Setting of external param 'force_key_frames' was added in 7bcc1b4eb8.
> It is available since v1.1.0 but ffmpeg allows linking against v0.9.0.

Plan to push tomorrow, barring objections.

Regards,
Gyan


> ---
>   libavcodec/libsvtav1.c | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
> index 8d2c7f3be4..862192945b 100644
> --- a/libavcodec/libsvtav1.c
> +++ b/libavcodec/libsvtav1.c
> @@ -250,6 +250,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
>       if (avctx->gop_size > 1)
>           param->intra_period_length  = avctx->gop_size - 1;
>   
> +#if SVT_AV1_CHECK_VERSION(1, 1, 0)
>       // In order for SVT-AV1 to force keyframes by setting pic_type to
>       // EB_AV1_KEY_PICTURE on any frame, force_key_frames has to be set. Note
>       // that this does not force all frames to be keyframes (it only forces a
> @@ -260,6 +261,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
>       // to be updated to set force_key_frames accordingly.
>       if (avctx->gop_size == 1)
>           param->force_key_frames = 1;
> +#endif
>   
>       if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {
>           param->frame_rate_numerator   = avctx->framerate.num;
Gyan Doshi Nov. 13, 2023, 7:48 a.m. UTC | #2 
On 2023-11-12 08:27 pm, Gyan Doshi wrote:
>
>
> On 2023-11-08 10:25 am, Gyan Doshi wrote:
>> Setting of external param 'force_key_frames' was added in 7bcc1b4eb8.
>> It is available since v1.1.0 but ffmpeg allows linking against v0.9.0.
>
> Plan to push tomorrow, barring objections.

Pushed as 67a2571a5547d39990e7f709f24d7a5b452ff8b9

Regards,
Gyan
diff mbox series

Patch

diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
index 8d2c7f3be4..862192945b 100644
--- a/libavcodec/libsvtav1.c
+++ b/libavcodec/libsvtav1.c
@@ -250,6 +250,7 @@  static int config_enc_params(EbSvtAv1EncConfiguration *param,
     if (avctx->gop_size > 1)
         param->intra_period_length  = avctx->gop_size - 1;
 
+#if SVT_AV1_CHECK_VERSION(1, 1, 0)
     // In order for SVT-AV1 to force keyframes by setting pic_type to
     // EB_AV1_KEY_PICTURE on any frame, force_key_frames has to be set. Note
     // that this does not force all frames to be keyframes (it only forces a
@@ -260,6 +261,7 @@  static int config_enc_params(EbSvtAv1EncConfiguration *param,
     // to be updated to set force_key_frames accordingly.
     if (avctx->gop_size == 1)
         param->force_key_frames = 1;
+#endif
 
     if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {
         param->frame_rate_numerator   = avctx->framerate.num;