October 2022 - ffmpeg-devel - lists.ffmpeg.org

[PATCH] avcodec/bonk: Check step
by Michael Niedermayer 03 Oct '22

03 Oct '22

Fixes: signed integer overflow: 2040812214 + 255101526 cannot be represented in type 'int' Fixes: 51323/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-4791481067503616 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/bonk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/bonk.c b/libavcodec/bonk.c index 409694f710d..32f7c9b9bdb 100644 --- a/libavcodec/bonk.c +++ b/libavcodec/bonk.c @@ -187,6 +187,9 @@ static int intlist_read(BonkContext *s, int *buf, int entries, int base_2_part) if (!dominant) n_zeros += steplet; + if (step > INT_MAX/9*8) + return AVERROR_INVALIDDATA; + step += step / 8; } else if (steplet > 0) { int actual_run = read_uint_max(s, steplet - 1); -- 2.17.1

4 5

[PATCH] libavcodec: Fix a comment typo
by Martin Storsjö 03 Oct '22

03 Oct '22

Signed-off-by: Martin Storsjö <martin(a)martin.st> --- libavcodec/packet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/packet.h b/libavcodec/packet.h index 404d520071..f28e7e7011 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -161,7 +161,7 @@ enum AVPacketSideDataType { * the packet may contain "dual mono" audio specific to Japanese DTV * and if it is true, recommends only the selected channel to be used. * @code - * u8 selected channels (0=mail/left, 1=sub/right, 2=both) + * u8 selected channels (0=main/left, 1=sub/right, 2=both) * @endcode */ AV_PKT_DATA_JP_DUALMONO, -- 2.37.0 (Apple Git-136)

2 1

[PATCH 1/5] avcodec/mpeg12vlc: Move MPEG-1/2 RL VLCs to it
by Andreas Rheinhardt 03 Oct '22

03 Oct '22

It is better place for these declarations than mpeg12data.h as RL VLC are just a variant of VLCs. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/mpeg12data.c | 1 + libavcodec/mpeg12data.h | 4 ---- libavcodec/mpeg12dec.h | 10 ---------- libavcodec/mpeg12enc.c | 1 + libavcodec/mpeg12enc.h | 3 --- libavcodec/mpeg12vlc.h | 15 +++++++++++++++ libavcodec/speedhq.c | 2 +- libavcodec/speedhqenc.c | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libavcodec/mpeg12data.c b/libavcodec/mpeg12data.c index 4da96d7da3..e301310b9f 100644 --- a/libavcodec/mpeg12data.c +++ b/libavcodec/mpeg12data.c @@ -26,6 +26,7 @@ */ #include "mpeg12data.h" +#include "mpeg12vlc.h" const uint16_t ff_mpeg1_default_intra_matrix[256] = { 8, 16, 19, 22, 26, 27, 29, 34, diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h index f51faf4607..bc39655fbf 100644 --- a/libavcodec/mpeg12data.h +++ b/libavcodec/mpeg12data.h @@ -30,7 +30,6 @@ #include <stdint.h> #include "libavutil/rational.h" -#include "rl.h" extern const uint16_t ff_mpeg1_default_intra_matrix[]; extern const uint16_t ff_mpeg1_default_non_intra_matrix[64]; @@ -40,9 +39,6 @@ extern const unsigned char ff_mpeg12_vlc_dc_lum_bits[12]; extern const uint16_t ff_mpeg12_vlc_dc_chroma_code[12]; extern const unsigned char ff_mpeg12_vlc_dc_chroma_bits[12]; -extern RLTable ff_rl_mpeg1; -extern RLTable ff_rl_mpeg2; - extern const uint8_t ff_mpeg12_mbAddrIncrTable[36][2]; extern const uint8_t ff_mpeg12_mbPatTable[64][2]; diff --git a/libavcodec/mpeg12dec.h b/libavcodec/mpeg12dec.h index b4e94a92ce..4c015d3096 100644 --- a/libavcodec/mpeg12dec.h +++ b/libavcodec/mpeg12dec.h @@ -24,16 +24,6 @@ #include "get_bits.h" #include "mpeg12vlc.h" -#include "rl.h" - -#define INIT_2D_VLC_RL(rl, static_size, flags)\ -{\ - static RL_VLC_ELEM rl_vlc_table[static_size];\ - rl.rl_vlc[0] = rl_vlc_table;\ - ff_init_2d_vlc_rl(&rl, static_size, flags);\ -} - -void ff_init_2d_vlc_rl(RLTable *rl, unsigned static_size, int flags); static inline int decode_dc(GetBitContext *gb, int component) { diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index e1f09b7ede..f636afe42d 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -43,6 +43,7 @@ #include "mpeg12.h" #include "mpeg12data.h" #include "mpeg12enc.h" +#include "mpeg12vlc.h" #include "mpegutils.h" #include "mpegvideo.h" #include "mpegvideoenc.h" diff --git a/libavcodec/mpeg12enc.h b/libavcodec/mpeg12enc.h index fbbc43f891..0455e5e4e2 100644 --- a/libavcodec/mpeg12enc.h +++ b/libavcodec/mpeg12enc.h @@ -25,9 +25,6 @@ #include <stdint.h> #include "mpegvideo.h" -#include "rl.h" - -void ff_mpeg1_init_uni_ac_vlc(const RLTable *rl, uint8_t *uni_ac_vlc_len); void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number); void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64], diff --git a/libavcodec/mpeg12vlc.h b/libavcodec/mpeg12vlc.h index 70aca645cb..4fb19371f0 100644 --- a/libavcodec/mpeg12vlc.h +++ b/libavcodec/mpeg12vlc.h @@ -28,6 +28,7 @@ #ifndef AVCODEC_MPEG12VLC_H #define AVCODEC_MPEG12VLC_H +#include "rl.h" #include "vlc.h" #define DC_VLC_BITS 9 @@ -49,4 +50,18 @@ extern VLC ff_mv_vlc; void ff_mpeg12_init_vlcs(void); +#define INIT_2D_VLC_RL(rl, static_size, flags)\ +{\ + static RL_VLC_ELEM rl_vlc_table[static_size];\ + rl.rl_vlc[0] = rl_vlc_table;\ + ff_init_2d_vlc_rl(&rl, static_size, flags);\ +} + +extern RLTable ff_rl_mpeg1; +extern RLTable ff_rl_mpeg2; + +void ff_init_2d_vlc_rl(RLTable *rl, unsigned static_size, int flags); + +void ff_mpeg1_init_uni_ac_vlc(const RLTable *rl, uint8_t *uni_ac_vlc_len); + #endif /* AVCODEC_MPEG12VLC_H */ diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 11d3311794..6dbba02776 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -38,9 +38,9 @@ #include "idctdsp.h" #include "libavutil/thread.h" #include "mathops.h" -#include "mpeg12dec.h" #include "mpeg12data.h" #include "mpeg12vlc.h" +#include "rl.h" #define MAX_INDEX (64 - 1) diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c index 747ed679bd..4a009bd070 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -34,7 +34,7 @@ #include "avcodec.h" #include "codec_internal.h" #include "mpeg12data.h" -#include "mpeg12enc.h" +#include "mpeg12vlc.h" #include "mpegvideo.h" #include "mpegvideoenc.h" #include "speedhqenc.h" -- 2.34.1

1 5

[PATCH] tiff: add support for one more tag
by Paul B Mahol 02 Oct '22

02 Oct '22

Patch attached.

1 0

[PATCH] avcodec/jpeg2000dsp: Use unsigned to avoid overflow
by Andreas Rheinhardt 02 Oct '22

02 Oct '22

Affected the jpeg2000dsp checkasm test. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/jpeg2000dsp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/jpeg2000dsp.c b/libavcodec/jpeg2000dsp.c index b61be3b72f..b1bff6d5b1 100644 --- a/libavcodec/jpeg2000dsp.c +++ b/libavcodec/jpeg2000dsp.c @@ -76,14 +76,13 @@ static void ict_int(void *_src0, void *_src1, void *_src2, int csize) static void rct_int(void *_src0, void *_src1, void *_src2, int csize) { - int32_t *src0 = _src0, *src1 = _src1, *src2 = _src2; - int32_t i0, i1, i2; + uint32_t *src0 = _src0, *src1 = _src1, *src2 = _src2; int i; for (i = 0; i < csize; i++) { - i1 = *src0 - (*src2 + *src1 >> 2); - i0 = i1 + *src2; - i2 = i1 + *src1; + uint32_t i1 = *src0 - ((int32_t)(*src2 + *src1) >> 2); + int32_t i0 = i1 + *src2; + int32_t i2 = i1 + *src1; *src0++ = i0; *src1++ = i1; *src2++ = i2; -- 2.34.1

2 5

[PATCH 1/6] avcodec/g723_1enc: Remove unnecessary av_clipl_int32()
by Andreas Rheinhardt 02 Oct '22

02 Oct '22

partial_corr is an int16_t and so the av_clipl_int32() never clips and can be removed. This also avoids undefined left-shifts of negative numbers. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/g723_1enc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/g723_1enc.c b/libavcodec/g723_1enc.c index f3baf7b4ec..a22985ca44 100644 --- a/libavcodec/g723_1enc.c +++ b/libavcodec/g723_1enc.c @@ -200,8 +200,7 @@ static void levinson_durbin(int16_t *lpc, int16_t *autocorr, int16_t error) partial_corr = temp / (error << 1); - lpc[i] = av_clipl_int32((int64_t) (partial_corr << 14) + - (1 << 15)) >> 16; + lpc[i] = (partial_corr + (1 << 1)) >> 2; /* Update the prediction error */ temp = MULL2(temp, partial_corr); -- 2.34.1

3 11

[PATCH 1/3] avcodec/wmavoice: Don't initialize GetBitContext with buf == NULL
by Andreas Rheinhardt 02 Oct '22

02 Oct '22

Happens when flushing. This triggers NULL + 0 (which is UB) in init_get_bits_xe (which previously errored out, but the return value has not been checked) and in copy_bits(). This fixes the wmavoice-(7|11|19)k FATE-tests with UBSan. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/wmavoice.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index 4438089e51..26744719e6 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -1900,6 +1900,8 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, AVFrame *frame, { WMAVoiceContext *s = ctx->priv_data; GetBitContext *gb = &s->gb; + const uint8_t *buf = avpkt->data; + uint8_t dummy[1]; int size, res, pos; /* Packets are sometimes a multiple of ctx->block_align, with a packet @@ -1908,7 +1910,8 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, AVFrame *frame, * in a single "muxer" packet, so we artificially emulate that by * capping the packet size at ctx->block_align. */ for (size = avpkt->size; size > ctx->block_align; size -= ctx->block_align); - init_get_bits8(&s->gb, avpkt->data, size); + buf = size ? buf : dummy; + init_get_bits8(&s->gb, buf, size); /* size == ctx->block_align is used to indicate whether we are dealing with * a new packet or a packet of which we already read the packet header @@ -1931,7 +1934,7 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, AVFrame *frame, if (cnt + s->spillover_nbits > avpkt->size * 8) { s->spillover_nbits = avpkt->size * 8 - cnt; } - copy_bits(&s->pb, avpkt->data, size, gb, s->spillover_nbits); + copy_bits(&s->pb, buf, size, gb, s->spillover_nbits); flush_put_bits(&s->pb); s->sframe_cache_size += s->spillover_nbits; if ((res = synth_superframe(ctx, frame, got_frame_ptr)) == 0 && @@ -1968,7 +1971,7 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, AVFrame *frame, } else if ((s->sframe_cache_size = pos) > 0) { /* ... cache it for spillover in next packet */ init_put_bits(&s->pb, s->sframe_cache, SFRAME_CACHE_MAXSIZE); - copy_bits(&s->pb, avpkt->data, size, gb, s->sframe_cache_size); + copy_bits(&s->pb, buf, size, gb, s->sframe_cache_size); // FIXME bad - just copy bytes as whole and add use the // skip_bits_next field } -- 2.34.1

1 3

[PATCH v1 1/2] avformat/imfdec: use CPL start timecode if available
by pal＠sandflow.com 02 Oct '22

02 Oct '22

From: Pierre-Anthony Lemieux <pal(a)palemieux.com> The IMF CPL contains an optional timecode start address. This patch reads the latter, if present, into the context's timecode metadata parameter. This addresses https://trac.ffmpeg.org/ticket/9842. --- libavformat/imf.h | 2 + libavformat/imf_cpl.c | 109 ++++++++++++++++++++++++++++++++++++++++++ libavformat/imfdec.c | 11 +++++ 3 files changed, 122 insertions(+) diff --git a/libavformat/imf.h b/libavformat/imf.h index 4271cd9582..70ed007312 100644 --- a/libavformat/imf.h +++ b/libavformat/imf.h @@ -59,6 +59,7 @@ #include "libavformat/avio.h" #include "libavutil/rational.h" #include "libavutil/uuid.h" +#include "libavutil/timecode.h" #include <libxml/tree.h> /** @@ -130,6 +131,7 @@ typedef struct FFIMFCPL { AVUUID id_uuid; /**< CompositionPlaylist/Id element */ xmlChar *content_title_utf8; /**< CompositionPlaylist/ContentTitle element */ AVRational edit_rate; /**< CompositionPlaylist/EditRate element */ + AVTimecode *tc; /**< CompositionPlaylist/CompositionTimecode element */ FFIMFMarkerVirtualTrack *main_markers_track; /**< Main Marker Virtual Track */ FFIMFTrackFileVirtualTrack *main_image_2d_track; /**< Main Image Virtual Track */ uint32_t main_audio_track_count; /**< Number of Main Audio Virtual Tracks */ diff --git a/libavformat/imf_cpl.c b/libavformat/imf_cpl.c index 4acc20feee..1868d7db45 100644 --- a/libavformat/imf_cpl.c +++ b/libavformat/imf_cpl.c @@ -116,6 +116,25 @@ int ff_imf_xml_read_uint32(xmlNodePtr element, uint32_t *number) return ret; } +static int ff_imf_xml_read_boolean(xmlNodePtr element, int *value) +{ + xmlChar *element_text = NULL; + int ret = 0; + + element_text = xmlNodeListGetString(element->doc, element->xmlChildrenNode, 1); + + if (xmlStrcmp(element_text, "true") == 0 || xmlStrcmp(element_text, "1") == 0) + *value = 1; + else if (xmlStrcmp(element_text, "false") == 0 || xmlStrcmp(element_text, "0") == 0) + *value = 0; + else + ret = 1; + + xmlFree(element_text); + + return ret; +} + static void imf_base_virtual_track_init(FFIMFBaseVirtualTrack *track) { memset(track->id_uuid, 0, sizeof(track->id_uuid)); @@ -179,6 +198,90 @@ static int fill_content_title(xmlNodePtr cpl_element, FFIMFCPL *cpl) return 0; } +static int digit_to_int(char digit) +{ + if (digit >= '0' && digit <= '9') + return digit - '0'; + return -1; +} + +/** + * Parses a string that conform to the TimecodeType used in IMF CPL and defined + * in SMPTE ST 2067-3. + * @param[in] s string to parse + * @param[out] tc_comps pointer to an array of 4 integers where the parsed HH, + * MM, SS and FF fields of the timecode are returned. + * @return 0 on success, < 0 AVERROR code on error. + */ +static int parse_cpl_tc_type(const char *s, int *tc_comps) +{ + if (av_strnlen(s, 11) != 11) + return AVERROR(EINVAL); + + for (int i = 0; i < 4; i++) { + int hi; + int lo; + + hi = digit_to_int(s[i * 3]); + lo = digit_to_int(s[i * 3 + 1]); + + if (hi == -1 || lo == -1) + return AVERROR(EINVAL); + + tc_comps[i] = 10 * hi + lo; + } + + return 0; +} + +static int fill_timecode(xmlNodePtr cpl_element, FFIMFCPL *cpl) +{ + xmlNodePtr tc_element = NULL; + xmlNodePtr element = NULL; + xmlChar *tc_str = NULL; + int df = 0; + int comps[4]; + int ret = 0; + + tc_element = ff_imf_xml_get_child_element_by_name(cpl_element, "CompositionTimecode"); + if (!tc_element) + return 0; + + element = ff_imf_xml_get_child_element_by_name(tc_element, "TimecodeDropFrame"); + if (!element) { + av_log(NULL, AV_LOG_ERROR, "CompositionTimecode element is missing\ + a TimecodeDropFrame child element\n"); + return AVERROR_INVALIDDATA; + } + + if (ff_imf_xml_read_boolean(element, &df)) { + av_log(NULL, AV_LOG_ERROR, "TimecodeDropFrame element is invalid\n"); + return AVERROR_INVALIDDATA; + } + element = ff_imf_xml_get_child_element_by_name(tc_element, "TimecodeStartAddress"); + if (!element) { + av_log(NULL, AV_LOG_ERROR, "CompositionTimecode element is missing\ + a TimecodeStartAddress child element\n"); + return AVERROR_INVALIDDATA; + } + + tc_str = xmlNodeListGetString(element->doc, element->xmlChildrenNode, 1); + ret = parse_cpl_tc_type(tc_str, comps); + xmlFree(tc_str); + if (ret) + return ret; + + cpl->tc = av_malloc(sizeof(AVTimecode)); + if (!cpl->tc) + return AVERROR(ENOMEM); + ret = av_timecode_init_from_components(cpl->tc, cpl->edit_rate, + df ? AV_TIMECODE_FLAG_DROPFRAME : 0, + comps[0], comps[1], comps[2], comps[3], + NULL); + + return ret; +} + static int fill_edit_rate(xmlNodePtr cpl_element, FFIMFCPL *cpl) { xmlNodePtr element = NULL; @@ -682,6 +785,8 @@ int ff_imf_parse_cpl_from_xml_dom(xmlDocPtr doc, FFIMFCPL **cpl) goto cleanup; if ((ret = fill_edit_rate(cpl_element, *cpl))) goto cleanup; + if ((ret = fill_timecode(cpl_element, *cpl))) + goto cleanup; if ((ret = fill_virtual_tracks(cpl_element, *cpl))) goto cleanup; @@ -731,6 +836,7 @@ static void imf_cpl_init(FFIMFCPL *cpl) av_uuid_nil(cpl->id_uuid); cpl->content_title_utf8 = NULL; cpl->edit_rate = av_make_q(0, 1); + cpl->tc = NULL; cpl->main_markers_track = NULL; cpl->main_image_2d_track = NULL; cpl->main_audio_track_count = 0; @@ -753,6 +859,9 @@ void ff_imf_cpl_free(FFIMFCPL *cpl) if (!cpl) return; + if (cpl->tc) + av_freep(&cpl->tc); + xmlFree(cpl->content_title_utf8); imf_marker_virtual_track_free(cpl->main_markers_track); diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index 5bbe7a53f8..fdf9a4e87c 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -622,6 +622,8 @@ static int imf_read_header(AVFormatContext *s) IMFContext *c = s->priv_data; char *asset_map_path; char *tmp_str; + AVDictionaryEntry* tcr; + char tc_buf[AV_TIMECODE_STR_SIZE]; int ret = 0; c->interrupt_callback = &s->interrupt_callback; @@ -641,6 +643,15 @@ static int imf_read_header(AVFormatContext *s) if ((ret = ff_imf_parse_cpl(s->pb, &c->cpl)) < 0) return ret; + tcr = av_dict_get(s->metadata, "timecode", NULL, 0); + if (!tcr && c->cpl->tc) { + ret = av_dict_set(&s->metadata, "timecode", + av_timecode_make_string(c->cpl->tc, tc_buf, 0), 0); + if (ret) + return ret; + av_log(s, AV_LOG_INFO, "Setting timecode to IMF CPL timecode %s\n", tc_buf); + } + av_log(s, AV_LOG_DEBUG, "parsed IMF CPL: " AV_PRI_URN_UUID "\n", -- 2.25.1

3 4

[PATCH] avcodec/vorbis: Split data declarations out into new header
by Andreas Rheinhardt 02 Oct '22

02 Oct '22

vorbis.h currently contains stuff only used by the native Vorbis codecs and some Vorbis tables, which are also used by Opus and libvorbis. Therefore split the data out into a header of its own. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavcodec/libopusdec.c | 2 +- libavcodec/libopusenc.c | 2 +- libavcodec/libvorbisenc.c | 1 - libavcodec/opus.c | 2 +- libavcodec/vorbis.c | 1 + libavcodec/vorbis.h | 10 ++-------- libavcodec/vorbis_data.c | 2 +- libavcodec/vorbis_data.h | 34 ++++++++++++++++++++++++++++++++++ libavcodec/vorbisdec.c | 1 + libavcodec/vorbisenc.c | 1 + 10 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 libavcodec/vorbis_data.h diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c index 31a04dfbeb..9b9a610343 100644 --- a/libavcodec/libopusdec.c +++ b/libavcodec/libopusdec.c @@ -31,9 +31,9 @@ #include "codec_internal.h" #include "decode.h" #include "internal.h" -#include "vorbis.h" #include "mathops.h" #include "libopus.h" +#include "vorbis_data.h" struct libopus_context { AVClass *class; diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 81e765403f..75bc491c9e 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -29,8 +29,8 @@ #include "codec_internal.h" #include "encode.h" #include "libopus.h" -#include "vorbis.h" #include "audio_frame_queue.h" +#include "vorbis_data.h" typedef struct LibopusEncOpts { int vbr; diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index f78a88bbcd..6331cf0d79 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -29,7 +29,6 @@ #include "codec_internal.h" #include "encode.h" #include "version.h" -#include "vorbis.h" #include "vorbis_parser.h" diff --git a/libavcodec/opus.c b/libavcodec/opus.c index 3540206347..b91f57dec3 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -33,7 +33,7 @@ #include "opus_celt.h" #include "opustab.h" #include "internal.h" -#include "vorbis.h" +#include "vorbis_data.h" static const uint16_t opus_frame_duration[32] = { 480, 960, 1920, 2880, diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index cca2aa7c63..d0b660b44a 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -30,6 +30,7 @@ #include "avcodec.h" #include "vorbis.h" +#include "vorbis_data.h" /* Helper functions */ diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h index 0dd109dd2e..aa1ec5719d 100644 --- a/libavcodec/vorbis.h +++ b/libavcodec/vorbis.h @@ -21,15 +21,9 @@ #ifndef AVCODEC_VORBIS_H #define AVCODEC_VORBIS_H -#include "avcodec.h" +#include <stdint.h> -extern const float ff_vorbis_floor1_inverse_db_table[256]; -extern const float * const ff_vorbis_vwin[8]; -extern const uint8_t ff_vorbis_channel_layout_offsets[8][8]; -#if FF_API_OLD_CHANNEL_LAYOUT -extern const uint64_t ff_vorbis_channel_layouts[9]; -#endif -extern const AVChannelLayout ff_vorbis_ch_layouts[9]; +#include "avcodec.h" typedef struct vorbis_floor1_entry { uint16_t x; diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c index 4f4ea03f15..1ebe146d8f 100644 --- a/libavcodec/vorbis_data.c +++ b/libavcodec/vorbis_data.c @@ -21,7 +21,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/mem_internal.h" -#include "vorbis.h" +#include "vorbis_data.h" const uint8_t ff_vorbis_channel_layout_offsets[8][8] = { { 0 }, diff --git a/libavcodec/vorbis_data.h b/libavcodec/vorbis_data.h new file mode 100644 index 0000000000..0fe19e509f --- /dev/null +++ b/libavcodec/vorbis_data.h @@ -0,0 +1,34 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_VORBIS_DATA_H +#define AVCODEC_VORBIS_DATA_H + +#include <stdint.h> + +#include "libavutil/channel_layout.h" + +extern const float ff_vorbis_floor1_inverse_db_table[256]; +extern const float * const ff_vorbis_vwin[8]; +extern const uint8_t ff_vorbis_channel_layout_offsets[8][8]; +#if FF_API_OLD_CHANNEL_LAYOUT +extern const uint64_t ff_vorbis_channel_layouts[9]; +#endif +extern const AVChannelLayout ff_vorbis_ch_layouts[9]; + +#endif /* AVCODEC_VORBIS_DATA_H */ diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 4a85500c10..715a7f7d03 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -40,6 +40,7 @@ #include "get_bits.h" #include "vorbis.h" #include "vorbisdsp.h" +#include "vorbis_data.h" #include "xiph.h" #define V_NB_BITS 8 diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index b33d758e44..dcafe7d591 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -33,6 +33,7 @@ #include "fft.h" #include "mathops.h" #include "vorbis.h" +#include "vorbis_data.h" #include "vorbis_enc_data.h" #include "audio_frame_queue.h" -- 2.34.1

1 1

[PATCH] avutil/channel_layout: Don't mention dead project
by Andreas Rheinhardt 02 Oct '22

02 Oct '22

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- libavutil/channel_layout.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index ff2b57bbe3..7808573118 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -270,7 +270,7 @@ typedef struct AVChannelCustom { * ignoring everything but the channel count, as long as av_channel_layout_check() * considers they are valid. * - * Unlike most structures in Libav, sizeof(AVChannelLayout) is a part of the + * Unlike most structures in FFmpeg, sizeof(AVChannelLayout) is a part of the * public ABI and may be used by the caller. E.g. it may be allocated on stack * or embedded in caller-defined structs. * -- 2.34.1

1 1