[FFmpeg-devel] [PATCH 1/2] avcodec/sbcenc: Mark sbc_encode_init() as av_cold

[Andreas Rheinhardt <andreas.rheinhardt@outlook.com>]

[-- Attachment #1: Type: text/plain, Size: 28 bytes --]

Patches attached

- Andreas

[-- Attachment #2: 0001-avcodec-sbcenc-Mark-sbc_encode_init-as-av_cold.patch --]
[-- Type: text/x-patch, Size: 872 bytes --]

From 7453c8ca973d886914cba7535a1a0835e9ae4f81 Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Thu, 6 Mar 2025 16:00:12 +0100
Subject: [PATCH 1/2] avcodec/sbcenc: Mark sbc_encode_init() as av_cold

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/sbcenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/sbcenc.c b/libavcodec/sbcenc.c
index f2c4fbe329..e2f84f7dfc 100644
--- a/libavcodec/sbcenc.c
+++ b/libavcodec/sbcenc.c
@@ -194,7 +194,7 @@ static size_t sbc_pack_frame(AVPacket *avpkt, struct sbc_frame *frame,
     return put_bytes_output(&pb);
 }
 
-static int sbc_encode_init(AVCodecContext *avctx)
+static av_cold int sbc_encode_init(AVCodecContext *avctx)
 {
     SBCEncContext *sbc = avctx->priv_data;
     struct sbc_frame *frame = &sbc->frame;
-- 
2.45.2


[-- Attachment #3: 0002-avcodec-sbcenc-Don-t-use-deprecated-AVCodec.supporte.patch --]
[-- Type: text/x-patch, Size: 1892 bytes --]

From a200651a7e28e17673ea3638435eefb5e004c7cb Mon Sep 17 00:00:00 2001
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Date: Thu, 6 Mar 2025 16:02:16 +0100
Subject: [PATCH 2/2] avcodec/sbcenc: Don't use deprecated
 AVCodec.supported_samplerates

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/sbcenc.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavcodec/sbcenc.c b/libavcodec/sbcenc.c
index e2f84f7dfc..6d23f19f62 100644
--- a/libavcodec/sbcenc.c
+++ b/libavcodec/sbcenc.c
@@ -49,6 +49,8 @@ typedef struct SBCEncContext {
     DECLARE_ALIGNED(SBC_ALIGN, SBCDSPContext, dsp);
 } SBCEncContext;
 
+static const int sbc_samplerates[] = { 16000, 32000, 44100, 48000, 0 };
+
 static int sbc_analyze_audio(SBCDSPContext *s, struct sbc_frame *frame)
 {
     int ch, blk;
@@ -260,8 +262,8 @@ static av_cold int sbc_encode_init(AVCodecContext *avctx)
         avctx->frame_size = 4*((frame->subbands >> 3) + 1) * 4*(frame->blocks >> 2);
     }
 
-    for (int i = 0; avctx->codec->supported_samplerates[i]; i++)
-        if (avctx->sample_rate == avctx->codec->supported_samplerates[i])
+    for (int i = 0; sbc_samplerates[i]; i++)
+        if (avctx->sample_rate == sbc_samplerates[i])
             frame->frequency = i;
 
     frame->channels = avctx->ch_layout.nb_channels;
@@ -359,7 +361,7 @@ const FFCodec ff_sbc_encoder = {
                                                          { 0 } },
     .p.sample_fmts         = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16,
                                                              AV_SAMPLE_FMT_NONE },
-    .p.supported_samplerates = (const int[]) { 16000, 32000, 44100, 48000, 0 },
+    .p.supported_samplerates = sbc_samplerates,
     .p.priv_class          = &sbc_class,
     .p.profiles            = NULL_IF_CONFIG_SMALL(ff_sbc_profiles),
 };
-- 
2.45.2


[-- Attachment #4: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".