March 2025 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] avfilter/colorize: add speed option
by Yannis Gerlach 25 Jan '26

25 Jan '26

The speed option allows to have a constant (per frame) change of hue. This allows for an easy way of creating an color changing effect without relying on somewhat complicated expressions. Signed-off-by: Yannis Gerlach <ffmpeg(a)ygerlach.de> --- libavfilter/vf_colorize.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_colorize.c b/libavfilter/vf_colorize.c index e6c563e3e2..ad8577c8fd 100644 --- a/libavfilter/vf_colorize.c +++ b/libavfilter/vf_colorize.c @@ -29,6 +29,7 @@ typedef struct ColorizeContext { float saturation; float lightness; float mix; + float speed; int depth; int c[3]; @@ -205,6 +206,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) ff_filter_execute(ctx, do_slice, frame, NULL, FFMIN(s->planeheight[1], ff_filter_get_nb_threads(ctx))); + s->hue += s->speed; + if (s->hue < 0.f) { + s->hue += 360.f; + } else if(s->hue > 360.f) { + s->hue -= 360.f; + } + return ff_filter_frame(ctx->outputs[0], frame); } @@ -263,10 +271,11 @@ static const AVFilterPad colorize_inputs[] = { #define VF AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_RUNTIME_PARAM static const AVOption colorize_options[] = { - { "hue", "set the hue", OFFSET(hue), AV_OPT_TYPE_FLOAT, {.dbl=0}, 0, 360, VF }, - { "saturation", "set the saturation", OFFSET(saturation), AV_OPT_TYPE_FLOAT, {.dbl=0.5},0, 1, VF }, - { "lightness", "set the lightness", OFFSET(lightness), AV_OPT_TYPE_FLOAT, {.dbl=0.5},0, 1, VF }, - { "mix", "set the mix of source lightness", OFFSET(mix), AV_OPT_TYPE_FLOAT, {.dbl=1}, 0, 1, VF }, + { "hue", "set the hue", OFFSET(hue), AV_OPT_TYPE_FLOAT, {.dbl=0}, 0, 360, VF }, + { "saturation", "set the saturation", OFFSET(saturation), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, VF }, + { "lightness", "set the lightness", OFFSET(lightness), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, VF }, + { "mix", "set the mix of source lightness", OFFSET(mix), AV_OPT_TYPE_FLOAT, {.dbl=1}, 0, 1, VF }, + { "speed", "set the change of hue per frame", OFFSET(speed), AV_OPT_TYPE_FLOAT, {.dbl=0}, -180, 180, VF }, { NULL } }; -- 2.34.1

2 4

[PATCH] doc/infra: More details about hosting and security
by Michael Niedermayer 30 Sep '25

30 Sep '25

From: Nikolay Aleksandrov <razor(a)blackwall.org> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> I have redacted the exact location of the FFmpeg server as writing that in public seems just a bad idea --- doc/infra.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/infra.txt b/doc/infra.txt index 0c339d7f9fd..08dcf04c307 100644 --- a/doc/infra.txt +++ b/doc/infra.txt @@ -24,6 +24,26 @@ Our Main server is hosted at telepoint.bg for more details see: https://www.ffmpeg.org/#thanks_sponsor_0001 Nothing runs on our main server directly, instead several VMs run on it. +Main server security: +--------------------- +Telepoint is one of the largest Bulgarian DC providers with multiple sibling companies offering +Internet, SDH, DWDM, peering exchange and hosting. They have multiple DC buildings in Sofia and +FFmpeg is hosted in XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX. The building is locked down and accessible +only with personal key cards that are registered. People who are granted access to a rack have +to go through the access center with their ID to get logged and receive a one-time access card +that can open the service elevator and only the hall where the destination rack is. All racks are +locked, once access is granted to someone they will get a key for the rack for the duration of +their visit. There are security cameras everywhere and personnel in the access center 24/7. As for +software security, our BIOS and IPMI are protected by password and encrypted connection, and +the machines can be accessed only by root administrators with their SSH keys. They're using +a Ubuntu LTS release and get regular security updates as they are released. We also get +notified by email for various security related events (e.g. failed sudo). + +Side note - Telepoint provides the rack and physical infrastructure, their sibling company called + Telehouse which is an ISP provides the connectivity, they are directly connected with + over 15 tier-1 service providers and have over 100 PoPs (points of presence) + in various cities. You can see more on www.telehouse.bg + ffmpeg.org VM: -------------- -- 2.47.0

1 2

FFmpeg 4.3.9 and 3.4.14
by Michael Niedermayer 05 Aug '25

05 Aug '25

Hi all As ive already backported and somewhat tested release/4.3 i intend to make the next point release from that and after that next is 3.4 (because its the supported branch that is longest without a release) like always, please backport things if you want something backported please test, if you want something tested and tell me if theres anything i need to know (like waiting for something) thx -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB In fact, the RIAA has been known to suggest that students drop out of college or go to community college in order to be able to afford settlements. -- The RIAA

2 7

[PATCH] vulkan_encode_h264/5: Fix uninitialized return value in write_extra_headers
by David Rosca 28 Jul '25

28 Jul '25

--- libavcodec/vulkan_encode_h264.c | 1 + libavcodec/vulkan_encode_h265.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libavcodec/vulkan_encode_h264.c b/libavcodec/vulkan_encode_h264.c index cdc87fb4ca..fdd3cc8a55 100644 --- a/libavcodec/vulkan_encode_h264.c +++ b/libavcodec/vulkan_encode_h264.c @@ -1311,6 +1311,7 @@ static int write_extra_headers(AVCodecContext *avctx, if (err < 0) goto fail; } else { + err = 0; *data_len = 0; } diff --git a/libavcodec/vulkan_encode_h265.c b/libavcodec/vulkan_encode_h265.c index cd50f2f756..8c25cacded 100644 --- a/libavcodec/vulkan_encode_h265.c +++ b/libavcodec/vulkan_encode_h265.c @@ -1471,6 +1471,7 @@ static int write_extra_headers(AVCodecContext *avctx, if (err < 0) goto fail; } else { + err = 0; *data_len = 0; } -- 2.47.0

1 1

[PATCH 1/5] avcodec/get_buffer: Use av_buffer_mallocz() for audio same as its done for video
by Michael Niedermayer 03 Jul '25

03 Jul '25

Fixes: Use of uninintialized value Fixes: 70993/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_LATM_fuzzer-6378949754552320 For the AAC/USAC/SBR code which reads uninitialized memory, it would be good, if it did not a fix for that is welcome! Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/get_buffer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/get_buffer.c b/libavcodec/get_buffer.c index ff19f61e86b..7e705380fc6 100644 --- a/libavcodec/get_buffer.c +++ b/libavcodec/get_buffer.c @@ -142,7 +142,10 @@ static int update_frame_pool(AVCodecContext *avctx, AVFrame *frame) if (ret < 0) goto fail; - pool->pools[0] = av_buffer_pool_init(pool->linesize[0], NULL); + pool->pools[0] = av_buffer_pool_init(pool->linesize[0], + CONFIG_MEMORY_POISONING ? + NULL : + av_buffer_allocz); if (!pool->pools[0]) { ret = AVERROR(ENOMEM); goto fail; -- 2.46.0

3 13

[PATCH] aacenc_tns: clamp filter direction energy measurement
by Lynne 30 Jun '25

30 Jun '25

The issue is that: float en[2]; ... tns->n_filt[w] = is8 ? 1 : order != TNS_MAX_ORDER ? 2 : 3; for (g = 0; g < tns->n_filt[w]; g++) { tns->direction[w][g] = slant != 2 ? slant : en[g] < en[!g]; When using the AAC Main profile, n_filt = 3, and slant is by default 2 (normal long frames), g can go above 1. en is the evolution of energy in the frequency domain for every band at the given window. E.g. whether the energy is concentrated at the top of each band, or the bottom. For 2-pole filters, its straightforward. For 3-pole filters, we need more than 2 measurements. This commit properly implements support for 3-pole filters, by measuring the band energy across three areas. Do note that even xHE-AAC caps n_filt to 2, and only AAC Main allows n_filt == 3. Fixes https://trac.ffmpeg.org/ticket/11418 --- libavcodec/aacenc_tns.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/libavcodec/aacenc_tns.c b/libavcodec/aacenc_tns.c index fa3cd2af39..f9bc033b26 100644 --- a/libavcodec/aacenc_tns.c +++ b/libavcodec/aacenc_tns.c @@ -173,6 +173,7 @@ void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce) sce->ics.window_sequence[0] == LONG_START_SEQUENCE ? 0 : 2; const int sfb_len = sfb_end - sfb_start; const int coef_len = sce->ics.swb_offset[sfb_end] - sce->ics.swb_offset[sfb_start]; + const int n_filt = is8 ? 1 : order != TNS_MAX_ORDER ? 2 : 3; if (coef_len <= 0 || sfb_len <= 0) { sce->tns.present = 0; @@ -180,16 +181,30 @@ void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce) } for (w = 0; w < sce->ics.num_windows; w++) { - float en[2] = {0.0f, 0.0f}; + float en[4] = {0.0f, 0.0f, 0.0f, 0.0f}; int oc_start = 0; int coef_start = sce->ics.swb_offset[sfb_start]; - for (g = sfb_start; g < sce->ics.num_swb && g <= sfb_end; g++) { - FFPsyBand *band = &s->psy.ch[s->cur_channel].psy_bands[w*16+g]; - if (g > sfb_start + (sfb_len/2)) - en[1] += band->energy; - else - en[0] += band->energy; + if (n_filt == 2) { + for (g = sfb_start; g < sce->ics.num_swb && g <= sfb_end; g++) { + FFPsyBand *band = &s->psy.ch[s->cur_channel].psy_bands[w*16+g]; + if (g > sfb_start + (sfb_len/2)) + en[1] += band->energy; /* End */ + else + en[0] += band->energy; /* Start */ + } + en[2] = en[0]; + } else { + for (g = sfb_start; g < sce->ics.num_swb && g <= sfb_end; g++) { + FFPsyBand *band = &s->psy.ch[s->cur_channel].psy_bands[w*16+g]; + if (g > sfb_start + (sfb_len/2) + (sfb_len/4)) + en[2] += band->energy; /* End */ + else if (g > sfb_start + (sfb_len/2) - (sfb_len/4)) + en[1] += band->energy; /* Middle */ + else + en[0] += band->energy; /* Start */ + } + en[3] = en[0]; } /* LPC */ @@ -199,9 +214,9 @@ void ff_aac_search_for_tns(AACEncContext *s, SingleChannelElement *sce) if (!order || !isfinite(gain) || gain < TNS_GAIN_THRESHOLD_LOW || gain > TNS_GAIN_THRESHOLD_HIGH) continue; - tns->n_filt[w] = is8 ? 1 : order != TNS_MAX_ORDER ? 2 : 3; + tns->n_filt[w] = n_filt; for (g = 0; g < tns->n_filt[w]; g++) { - tns->direction[w][g] = slant != 2 ? slant : en[g] < en[!g]; + tns->direction[w][g] = slant != 2 ? slant : en[g] < en[g + 1]; tns->order[w][g] = order/tns->n_filt[w]; tns->length[w][g] = sfb_len/tns->n_filt[w]; quantize_coefs(&coefs[oc_start], tns->coef_idx[w][g], tns->coef[w][g], -- 2.47.2

2 1

[PATCH] mpegts.c: pat_cb(): ensure all PIDs are valid
by Scott Theisen 30 Jun '25

30 Jun '25

originally from: https://github.com/MythTV/mythtv/commit/a1d4d112c3f962a85ddd6248592421171fc… referencing: https://code.mythtv.org/trac/ticket/1887 ISO/IEC 13818-1:2021 specifies a valid range of [0x0010, 0x1FFE] in § 2.4.4.6 Semantic definition of fields in program association section and Table 2-3 – PID table --- libavformat/mpegts.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 78ab7f7efe..6d5dc3050b 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2580,6 +2580,12 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len break; av_log(ts->stream, AV_LOG_TRACE, "sid=0x%x pid=0x%x\n", sid, pmt_pid); + if (pmt_pid <= 0x000F || pmt_pid >= 0x1FFF) + { + av_log(ts->stream, AV_LOG_ERROR, "Invalid PAT ignored " + "MPEG Program Number=0x%x pid=0x%x\n", sid, pmt_pid); + return; + } if (sid == 0x0000) { /* NIT info */ -- 2.43.0

2 2

[PATCH] dvbsubenc: add a disable_2bpp option to work around some decoders.
by Waider 25 Jun '25

25 Jun '25

As noted in the code in several places, some DVB subtitle decoders don't handle 2bpp color. This patch adds a disable_2bpp option which disables the 2bpp format; subtitles which would use 2bpp will be bumped up to 4bpp. Signed-off-by: Ronan Waide <waider(a)waider.ie> --- doc/encoders.texi | 24 ++++++++++++ libavcodec/dvbsubenc.c | 85 +++++++++++++++++++++++++++++++++--------- 2 files changed, 92 insertions(+), 17 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index f3fcc1aa60..d6dc92a047 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -4484,6 +4484,30 @@ Reduces detail but attempts to preserve color at extremely low bitrates. @chapter Subtitles Encoders @c man begin SUBTITLES ENCODERS +@section dvbsub + +This codec encodes the bitmap subtitle format that is used in DVB +broadcasts and recordings. The bitmaps are typically embedded in a +container such as MPEG-TS as a separate stream. + +@subsection Options + +@table @option +@item disable_2bpp @var{boolean} +Disable the 2 bits-per-pixel encoding format. + +DVB supports 2, 4, and 8 bits-per-pixel color lookup tables. However, +not all players support or properly support 2 bits-per-pixel, +resulting in unusable subtitles. +@table @option +@item 0 +The 2 bits-per-pixel encoding format will be used for subtitles with 4 +colors or less. (default) +@item 1 +The 2 bits-per-pixel encoding format will be disabled, and subtitles +with 4 colors or less will use a 4 bits-per-pixel format. +@end table + @section dvdsub This codec encodes the bitmap subtitle format that is used in DVDs. diff --git a/libavcodec/dvbsubenc.c b/libavcodec/dvbsubenc.c index 822e3a5309..727a75e901 100644 --- a/libavcodec/dvbsubenc.c +++ b/libavcodec/dvbsubenc.c @@ -22,9 +22,13 @@ #include "bytestream.h" #include "codec_internal.h" #include "libavutil/colorspace.h" +#include "libavutil/opt.h" typedef struct DVBSubtitleContext { + AVClass * class; int object_version; + int disable_2bpp; + int min_colors; } DVBSubtitleContext; #define PUTBITS2(val)\ @@ -38,6 +42,18 @@ typedef struct DVBSubtitleContext { }\ } +static int dvbsub_init(AVCodecContext *avctx) +{ + DVBSubtitleContext *s = avctx->priv_data; + if (s->disable_2bpp) { + av_log(avctx, AV_LOG_DEBUG, "Disabling 2bpp subtitles.\n"); + s->min_colors = 16; + } else { + s->min_colors = 0; + } + return 0; +} + static int dvb_encode_rle2(uint8_t **pq, int buf_size, const uint8_t *bitmap, int linesize, int w, int h) @@ -326,18 +342,22 @@ static int dvbsub_encode(AVCodecContext *avctx, uint8_t *outbuf, int buf_size, if (h->num_rects) { for (clut_id = 0; clut_id < h->num_rects; clut_id++) { - if (buf_size < 6 + h->rects[clut_id]->nb_colors * 6) + int nb_colors = s->min_colors > h->rects[clut_id]->nb_colors + ? s->min_colors + : h->rects[clut_id]->nb_colors; + + if (buf_size < 6 + nb_colors * 6) return AVERROR_BUFFER_TOO_SMALL; /* CLUT segment */ - if (h->rects[clut_id]->nb_colors <= 4) { + if (nb_colors <= 4) { /* 2 bpp, some decoders do not support it correctly */ bpp_index = 0; - } else if (h->rects[clut_id]->nb_colors <= 16) { + } else if (nb_colors <= 16) { /* 4 bpp, standard encoding */ bpp_index = 1; - } else if (h->rects[clut_id]->nb_colors <= 256) { + } else if (nb_colors <= 256) { /* 8 bpp, standard encoding */ bpp_index = 2; } else { @@ -354,16 +374,24 @@ static int dvbsub_encode(AVCodecContext *avctx, uint8_t *outbuf, int buf_size, *q++ = clut_id; *q++ = (0 << 4) | 0xf; /* version = 0 */ - for(i = 0; i < h->rects[clut_id]->nb_colors; i++) { + for(i = 0; i < nb_colors; i++) { *q++ = i; /* clut_entry_id */ *q++ = (1 << (7 - bpp_index)) | (0xf << 1) | 1; /* 2 bits/pixel full range */ { int a, r, g, b; - uint32_t x= ((uint32_t*)h->rects[clut_id]->data[1])[i]; - a = (x >> 24) & 0xff; - r = (x >> 16) & 0xff; - g = (x >> 8) & 0xff; - b = (x >> 0) & 0xff; + if (i < h->rects[clut_id]->nb_colors) { + uint32_t x= ((uint32_t*)h->rects[clut_id]->data[1])[i]; + a = (x >> 24) & 0xff; + r = (x >> 16) & 0xff; + g = (x >> 8) & 0xff; + b = (x >> 0) & 0xff; + } else { + /* pad out the CLUT */ + a = 0; + r = 0; + g = 0; + b = 0; + } *q++ = RGB_TO_Y_CCIR(r, g, b); *q++ = RGB_TO_V_CCIR(r, g, b, 0); @@ -373,7 +401,7 @@ static int dvbsub_encode(AVCodecContext *avctx, uint8_t *outbuf, int buf_size, } bytestream_put_be16(&pseg_len, q - pseg_len - 2); - buf_size -= 6 + h->rects[clut_id]->nb_colors * 6; + buf_size -= 6 + nb_colors * 6; } if (buf_size < h->num_rects * 22) @@ -381,14 +409,17 @@ static int dvbsub_encode(AVCodecContext *avctx, uint8_t *outbuf, int buf_size, for (region_id = 0; region_id < h->num_rects; region_id++) { /* region composition segment */ + int nb_colors = s->min_colors > h->rects[region_id]->nb_colors + ? s->min_colors + : h->rects[region_id]->nb_colors; - if (h->rects[region_id]->nb_colors <= 4) { + if (nb_colors <= 4) { /* 2 bpp, some decoders do not support it correctly */ bpp_index = 0; - } else if (h->rects[region_id]->nb_colors <= 16) { + } else if (nb_colors <= 16) { /* 4 bpp, standard encoding */ bpp_index = 1; - } else if (h->rects[region_id]->nb_colors <= 256) { + } else if (nb_colors <= 256) { /* 8 bpp, standard encoding */ bpp_index = 2; } else { @@ -424,17 +455,21 @@ static int dvbsub_encode(AVCodecContext *avctx, uint8_t *outbuf, int buf_size, const uint8_t *bitmap, int linesize, int w, int h); + int nb_colors = s->min_colors > h->rects[object_id]->nb_colors + ? s->min_colors + : h->rects[object_id]->nb_colors; + if (buf_size < 13) return AVERROR_BUFFER_TOO_SMALL; /* bpp_index maths */ - if (h->rects[object_id]->nb_colors <= 4) { + if (nb_colors <= 4) { /* 2 bpp, some decoders do not support it correctly */ dvb_encode_rle = dvb_encode_rle2; - } else if (h->rects[object_id]->nb_colors <= 16) { + } else if (nb_colors <= 16) { /* 4 bpp, standard encoding */ dvb_encode_rle = dvb_encode_rle4; - } else if (h->rects[object_id]->nb_colors <= 256) { + } else if (nb_colors <= 256) { /* 8 bpp, standard encoding */ dvb_encode_rle = dvb_encode_rle8; } else { @@ -506,6 +541,20 @@ static int dvbsub_encode(AVCodecContext *avctx, uint8_t *outbuf, int buf_size, return q - outbuf; } +#define OFFSET(x) offsetof(DVBSubtitleContext, x) +#define SE AV_OPT_FLAG_SUBTITLE_PARAM | AV_OPT_FLAG_ENCODING_PARAM +static const AVOption options[] = { + {"disable_2bpp", "disable the 2bpp subtitle encoder", OFFSET(disable_2bpp), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, SE}, + { NULL }, +}; + +static const AVClass dvbsubenc_class = { + .class_name = "DVBSUB subtitle encoder", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + const FFCodec ff_dvbsub_encoder = { .p.name = "dvbsub", CODEC_LONG_NAME("DVB subtitles"), @@ -513,4 +562,6 @@ const FFCodec ff_dvbsub_encoder = { .p.id = AV_CODEC_ID_DVB_SUBTITLE, .priv_data_size = sizeof(DVBSubtitleContext), FF_CODEC_ENCODE_SUB_CB(dvbsub_encode), + .init = dvbsub_init, + .p.priv_class = &dvbsubenc_class, }; -- 2.39.5 (Apple Git-154)

5 20

[PATCH] Mark C globals with small code model
by Pranav Kant 23 Jun '25

23 Jun '25

By default, all globals in C/C++ compiled by clang are allocated in non-large data sections. See [1] for background on code models. For PIC (Position independent code), this is fine as long as binary is small but as binary size increases, users maybe want to use medium/large code models (-mcmodel=medium) which moves data in to large sections. As data in these large sections cannot be accessed using PIC code anymore (as it may be too far away), compiler ends up using a different instruction sequence when building C/C++ code -- using GOT to access these globals (which can be relaxed by linker at link time if binary ends up being smaller). However, assembly files continue to access these globals defined in C/C++ files using older (and invalid instruction sequence). So, we mark all such globals with an attribute that forces them to be allocated in small sections allowing them to validly be accessed from the assembly code. This patch should not have any affect on builds that use small code model, which is the default mode. [1] https://eli.thegreenplace.net/2012/01/03/understanding-the-x64-code-models --- libavcodec/ac3dsp.c | 2 +- libavcodec/cabac.c | 3 ++- libavcodec/x86/constants.c | 8 ++++++++ libavutil/attributes.h | 6 ++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c index 730fa70fff..43b4fcbda9 100644 --- a/libavcodec/ac3dsp.c +++ b/libavcodec/ac3dsp.c @@ -104,7 +104,7 @@ static void ac3_update_bap_counts_c(uint16_t mant_cnt[16], uint8_t *bap, mant_cnt[bap[len]]++; } -DECLARE_ALIGNED(16, const uint16_t, ff_ac3_bap_bits)[16] = { +av_mcmodel_small DECLARE_ALIGNED(16, const uint16_t, ff_ac3_bap_bits)[16] = { 0, 0, 0, 3, 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 16 }; diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c index 7d41cd2ae6..dfc3ba135a 100644 --- a/libavcodec/cabac.c +++ b/libavcodec/cabac.c @@ -24,12 +24,13 @@ * Context Adaptive Binary Arithmetic Coder. */ +#include "libavutil/attributes.h" #include "libavutil/error.h" #include "libavutil/mem_internal.h" #include "cabac.h" -DECLARE_ASM_ALIGNED(1, const uint8_t, ff_h264_cabac_tables)[512 + 4*2*64 + 4*64 + 63] = { +av_mcmodel_small DECLARE_ASM_ALIGNED(1, const uint8_t, ff_h264_cabac_tables)[512 + 4*2*64 + 4*64 + 63] = { 9,8,7,7,6,6,6,6,5,5,5,5,5,5,5,5, 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, diff --git a/libavcodec/x86/constants.c b/libavcodec/x86/constants.c index bc7f2b17b8..9a5af2871c 100644 --- a/libavcodec/x86/constants.c +++ b/libavcodec/x86/constants.c @@ -18,17 +18,21 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/attributes.h" #include "libavutil/mem_internal.h" #include "libavutil/x86/asm.h" // for xmm_reg #include "constants.h" +av_mcmodel_small DECLARE_ALIGNED(32, const ymm_reg, ff_pw_1) = { 0x0001000100010001ULL, 0x0001000100010001ULL, 0x0001000100010001ULL, 0x0001000100010001ULL }; DECLARE_ALIGNED(32, const ymm_reg, ff_pw_2) = { 0x0002000200020002ULL, 0x0002000200020002ULL, 0x0002000200020002ULL, 0x0002000200020002ULL }; DECLARE_ASM_ALIGNED(16, const xmm_reg, ff_pw_3) = { 0x0003000300030003ULL, 0x0003000300030003ULL }; +av_mcmodel_small DECLARE_ASM_ALIGNED(32, const ymm_reg, ff_pw_4) = { 0x0004000400040004ULL, 0x0004000400040004ULL, 0x0004000400040004ULL, 0x0004000400040004ULL }; +av_mcmodel_small DECLARE_ASM_ALIGNED(16, const xmm_reg, ff_pw_5) = { 0x0005000500050005ULL, 0x0005000500050005ULL }; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_8) = { 0x0008000800080008ULL, 0x0008000800080008ULL }; DECLARE_ASM_ALIGNED(16, const xmm_reg, ff_pw_9) = { 0x0009000900090009ULL, 0x0009000900090009ULL }; @@ -49,6 +53,7 @@ DECLARE_ALIGNED(32, const ymm_reg, ff_pw_256) = { 0x0100010001000100ULL, 0x010 DECLARE_ALIGNED(32, const ymm_reg, ff_pw_512) = { 0x0200020002000200ULL, 0x0200020002000200ULL, 0x0200020002000200ULL, 0x0200020002000200ULL }; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_1019) = { 0x03FB03FB03FB03FBULL, 0x03FB03FB03FB03FBULL }; +av_mcmodel_small DECLARE_ALIGNED(32, const ymm_reg, ff_pw_1023) = { 0x03ff03ff03ff03ffULL, 0x03ff03ff03ff03ffULL, 0x03ff03ff03ff03ffULL, 0x03ff03ff03ff03ffULL}; DECLARE_ALIGNED(32, const ymm_reg, ff_pw_1024) = { 0x0400040004000400ULL, 0x0400040004000400ULL, @@ -66,13 +71,16 @@ DECLARE_ALIGNED(32, const ymm_reg, ff_pw_m1) = { 0xFFFFFFFFFFFFFFFFULL, 0xFFF DECLARE_ALIGNED(32, const ymm_reg, ff_pb_0) = { 0x0000000000000000ULL, 0x0000000000000000ULL, 0x0000000000000000ULL, 0x0000000000000000ULL }; +av_mcmodel_small DECLARE_ALIGNED(32, const ymm_reg, ff_pb_1) = { 0x0101010101010101ULL, 0x0101010101010101ULL, 0x0101010101010101ULL, 0x0101010101010101ULL }; DECLARE_ALIGNED(32, const ymm_reg, ff_pb_2) = { 0x0202020202020202ULL, 0x0202020202020202ULL, 0x0202020202020202ULL, 0x0202020202020202ULL }; +av_mcmodel_small DECLARE_ALIGNED(32, const ymm_reg, ff_pb_3) = { 0x0303030303030303ULL, 0x0303030303030303ULL, 0x0303030303030303ULL, 0x0303030303030303ULL }; DECLARE_ALIGNED(32, const xmm_reg, ff_pb_15) = { 0x0F0F0F0F0F0F0F0FULL, 0x0F0F0F0F0F0F0F0FULL }; +av_mcmodel_small DECLARE_ALIGNED(32, const ymm_reg, ff_pb_80) = { 0x8080808080808080ULL, 0x8080808080808080ULL, 0x8080808080808080ULL, 0x8080808080808080ULL }; DECLARE_ALIGNED(32, const ymm_reg, ff_pb_FE) = { 0xFEFEFEFEFEFEFEFEULL, 0xFEFEFEFEFEFEFEFEULL, diff --git a/libavutil/attributes.h b/libavutil/attributes.h index 04c615c952..704a7070db 100644 --- a/libavutil/attributes.h +++ b/libavutil/attributes.h @@ -104,6 +104,12 @@ # define attribute_deprecated #endif +#if defined(__clang__) && __has_attribute(model) +# define av_mcmodel_small __attribute__((model("small"))) +#else +# define av_mcmodel_small +#endif + /** * Disable warnings about deprecated features * This is useful for sections of code kept for backward compatibility and -- 2.48.1.658.g4767266eb4-goog

7 25

[PATCH] avformat/hls: fix typo There is an extra space in the original comment
by Jack Lau 15 Jun '25

15 Jun '25

--- libavformat/hls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 3bdc1bc848..c2130bb883 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1993,7 +1993,7 @@ static int hls_read_header(AVFormatContext *s) return ret; /* XXX: Some HLS servers don't like being sent the range header, - in this case, need to setting http_seekable = 0 to disable + in this case, need to setting http_seekable = 0 to disable the range header */ av_dict_set_int(&c->avio_opts, "seekable", c->http_seekable, 0); -- 2.48.1

4 7