September 2023 - ffmpeg-cvslog

avcodec/bgmc: Use void* instead of AVCodecContext* as logctx
by Andreas Rheinhardt 30 Sep '23

30 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 28 22:12:57 2023 +0200| [145db38f9b0f05b571fa25334ffffa841fb4ed5e] | committer: Andreas Rheinhardt avcodec/bgmc: Use void* instead of AVCodecContext* as logctx Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=145db38f9b0f05b57… --- libavcodec/bgmc.c | 4 ++-- libavcodec/bgmc.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/bgmc.c b/libavcodec/bgmc.c index 361f7c52e6..0e41a39e00 100644 --- a/libavcodec/bgmc.c +++ b/libavcodec/bgmc.c @@ -457,7 +457,7 @@ static uint8_t *bgmc_lut_getp(uint8_t *lut, int *lut_status, int delta) /** Initialize the lookup table arrays */ -av_cold int ff_bgmc_init(AVCodecContext *avctx, +av_cold int ff_bgmc_init(void *logctx, uint8_t **cf_lut, int **cf_lut_status) { *cf_lut = av_malloc(sizeof(**cf_lut) * LUT_BUFF * 16 * LUT_SIZE); @@ -465,7 +465,7 @@ av_cold int ff_bgmc_init(AVCodecContext *avctx, if (!*cf_lut || !*cf_lut_status) { ff_bgmc_end(cf_lut, cf_lut_status); - av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); + av_log(logctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); return AVERROR(ENOMEM); } else { // initialize lut_status buffer to a value never used to compare against diff --git a/libavcodec/bgmc.h b/libavcodec/bgmc.h index 466df31a2e..81771d4aef 100644 --- a/libavcodec/bgmc.h +++ b/libavcodec/bgmc.h @@ -30,11 +30,10 @@ #define AVCODEC_BGMC_H -#include "avcodec.h" #include "get_bits.h" -int ff_bgmc_init(AVCodecContext *avctx, uint8_t **cf_lut, int **cf_lut_status); +int ff_bgmc_init(void *logctx, uint8_t **cf_lut, int **cf_lut_status); void ff_bgmc_end(uint8_t **cf_lut, int **cf_lut_status);

1 0

avcodec/flac_parse: Use void* instead of AVCodecContext* as logctx
by Andreas Rheinhardt 30 Sep '23

30 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 28 21:51:58 2023 +0200| [7a9bc091760b983bb072b42bc806d19e2e632b70] | committer: Andreas Rheinhardt avcodec/flac_parse: Use void* instead of AVCodecContext* as logctx It more directly shows that ff_flac_decode_frame_header() does not modify the AVCodecContext given to it at all; and it would not be allowed to do so, given that it is used by the parser when it is still unknown whether said frame header is even valid. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a9bc091760b983bb… --- libavcodec/flac.c | 18 +++++++++--------- libavcodec/flac_parse.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 174b4801be..fac4cff9e7 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -48,14 +48,14 @@ static int64_t get_utf8(GetBitContext *gb) return val; } -int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, +int ff_flac_decode_frame_header(void *logctx, GetBitContext *gb, FLACFrameInfo *fi, int log_level_offset) { int bs_code, sr_code, bps_code; /* frame sync code */ if ((get_bits(gb, 15) & 0x7FFF) != 0x7FFC) { - av_log(avctx, AV_LOG_ERROR + log_level_offset, "invalid sync code\n"); + av_log(logctx, AV_LOG_ERROR + log_level_offset, "invalid sync code\n"); return AVERROR_INVALIDDATA; } @@ -75,7 +75,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, fi->channels = 2; fi->ch_mode -= FLAC_MAX_CHANNELS - 1; } else { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "invalid channel mode: %d\n", fi->ch_mode); return AVERROR_INVALIDDATA; } @@ -83,7 +83,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, /* bits per sample */ bps_code = get_bits(gb, 3); if (bps_code == 3) { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "invalid sample size code (%d)\n", bps_code); return AVERROR_INVALIDDATA; @@ -92,7 +92,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, /* reserved bit */ if (get_bits1(gb)) { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "broken stream, invalid padding\n"); return AVERROR_INVALIDDATA; } @@ -100,14 +100,14 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, /* sample or frame count */ fi->frame_or_sample_num = get_utf8(gb); if (fi->frame_or_sample_num < 0) { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "sample/frame number invalid; utf8 fscked\n"); return AVERROR_INVALIDDATA; } /* blocksize */ if (bs_code == 0) { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "reserved blocksize code: 0\n"); return AVERROR_INVALIDDATA; } else if (bs_code == 6) { @@ -128,7 +128,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, } else if (sr_code == 14) { fi->samplerate = get_bits(gb, 16) * 10; } else { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "illegal sample rate code %d\n", sr_code); return AVERROR_INVALIDDATA; @@ -138,7 +138,7 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, skip_bits(gb, 8); if (av_crc(av_crc_get_table(AV_CRC_8_ATM), 0, gb->buffer, get_bits_count(gb)/8)) { - av_log(avctx, AV_LOG_ERROR + log_level_offset, + av_log(logctx, AV_LOG_ERROR + log_level_offset, "header crc mismatch\n"); return AVERROR_INVALIDDATA; } diff --git a/libavcodec/flac_parse.h b/libavcodec/flac_parse.h index 67a7320bea..b0cbad825e 100644 --- a/libavcodec/flac_parse.h +++ b/libavcodec/flac_parse.h @@ -75,13 +75,13 @@ int ff_flac_is_extradata_valid(AVCodecContext *avctx, /** * Validate and decode a frame header. - * @param avctx AVCodecContext to use as av_log() context + * @param logctx context for logging * @param gb GetBitContext from which to read frame header * @param[out] fi frame information * @param log_level_offset log level offset. can be used to silence error messages. * @return non-zero on error, 0 if ok */ -int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, +int ff_flac_decode_frame_header(void *logctx, GetBitContext *gb, FLACFrameInfo *fi, int log_level_offset); void ff_flac_set_channel_layout(AVCodecContext *avctx, int channels);

1 0

avcodec/lagarith: Use void* instead of AVCodecContext* as logctx
by Andreas Rheinhardt 30 Sep '23

30 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 28 21:48:04 2023 +0200| [3ea73bc78a8b43abbb58b47de96cac07c06d0a20] | committer: Andreas Rheinhardt avcodec/lagarith: Use void* instead of AVCodecContext* as logctx Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ea73bc78a8b43abb… --- libavcodec/lagarith.c | 14 +++++++------- libavcodec/lagarithrac.h | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index 3288c0517c..9574f78871 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -166,17 +166,17 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb) /* Read probabilities from bitstream */ for (i = 1; i < 257; i++) { if (lag_decode_prob(gb, &rac->prob[i]) < 0) { - av_log(rac->avctx, AV_LOG_ERROR, "Invalid probability encountered.\n"); + av_log(rac->logctx, AV_LOG_ERROR, "Invalid probability encountered.\n"); return AVERROR_INVALIDDATA; } if ((uint64_t)cumul_prob + rac->prob[i] > UINT_MAX) { - av_log(rac->avctx, AV_LOG_ERROR, "Integer overflow encountered in cumulative probability calculation.\n"); + av_log(rac->logctx, AV_LOG_ERROR, "Integer overflow encountered in cumulative probability calculation.\n"); return AVERROR_INVALIDDATA; } cumul_prob += rac->prob[i]; if (!rac->prob[i]) { if (lag_decode_prob(gb, &prob)) { - av_log(rac->avctx, AV_LOG_ERROR, "Invalid probability run encountered.\n"); + av_log(rac->logctx, AV_LOG_ERROR, "Invalid probability run encountered.\n"); return AVERROR_INVALIDDATA; } if (prob > 256 - i) @@ -189,7 +189,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb) } if (!cumul_prob) { - av_log(rac->avctx, AV_LOG_ERROR, "All probabilities are 0!\n"); + av_log(rac->logctx, AV_LOG_ERROR, "All probabilities are 0!\n"); return AVERROR_INVALIDDATA; } @@ -207,7 +207,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb) scaled_cumul_prob += rac->prob[i]; } if (scaled_cumul_prob <= 0) { - av_log(rac->avctx, AV_LOG_ERROR, "Scaled probabilities invalid\n"); + av_log(rac->logctx, AV_LOG_ERROR, "Scaled probabilities invalid\n"); return AVERROR_INVALIDDATA; } for (; i < 257; i++) { @@ -221,7 +221,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb) cumulative_target = 1U << scale_factor; if (scaled_cumul_prob > cumulative_target) { - av_log(rac->avctx, AV_LOG_ERROR, + av_log(rac->logctx, AV_LOG_ERROR, "Scaled probabilities are larger than target!\n"); return AVERROR_INVALIDDATA; } @@ -463,7 +463,7 @@ static int lag_decode_arith_plane(LagarithContext *l, uint8_t *dst, const uint8_t *src_end = src + src_size; int ret; - rac.avctx = l->avctx; + rac.logctx = l->avctx; l->zeros = 0; if(src_size < 2) diff --git a/libavcodec/lagarithrac.h b/libavcodec/lagarithrac.h index a31b054dbb..2c8cb7385a 100644 --- a/libavcodec/lagarithrac.h +++ b/libavcodec/lagarithrac.h @@ -32,11 +32,10 @@ #include <stdint.h> #include "libavutil/intreadwrite.h" -#include "avcodec.h" #include "get_bits.h" typedef struct lag_rac { - AVCodecContext *avctx; + void *logctx; unsigned low; unsigned range; unsigned scale; /**< Number of bits of precision in range. */

1 0

avcodec/roqvideo: Use void*, not AVCodecContext* for logctx
by Andreas Rheinhardt 30 Sep '23

30 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 28 21:30:05 2023 +0200| [08dd036b9fc79f79cbe64245b06db903428b3bde] | committer: Andreas Rheinhardt avcodec/roqvideo: Use void*, not AVCodecContext* for logctx Also stop setting the field once per encode-frame. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08dd036b9fc79f79c… --- libavcodec/roqvideo.c | 4 ++-- libavcodec/roqvideo.h | 4 ++-- libavcodec/roqvideodec.c | 8 ++++---- libavcodec/roqvideoenc.c | 8 +++----- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/libavcodec/roqvideo.c b/libavcodec/roqvideo.c index f9a3c8e083..ca8c8de967 100644 --- a/libavcodec/roqvideo.c +++ b/libavcodec/roqvideo.c @@ -111,13 +111,13 @@ static inline void apply_motion_generic(RoqContext *ri, int x, int y, int deltax /* check MV against frame boundaries */ if ((mx < 0) || (mx > ri->width - sz) || (my < 0) || (my > ri->height - sz)) { - av_log(ri->avctx, AV_LOG_ERROR, "motion vector out of bounds: MV = (%d, %d), boundaries = (0, 0, %d, %d)\n", + av_log(ri->logctx, AV_LOG_ERROR, "motion vector out of bounds: MV = (%d, %d), boundaries = (0, 0, %d, %d)\n", mx, my, ri->width, ri->height); return; } if (!ri->last_frame->data[0]) { - av_log(ri->avctx, AV_LOG_ERROR, "Invalid decode type. Invalid header?\n"); + av_log(ri->logctx, AV_LOG_ERROR, "Invalid decode type. Invalid header?\n"); return; } diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h index 8318b6e5a0..2c2e42884d 100644 --- a/libavcodec/roqvideo.h +++ b/libavcodec/roqvideo.h @@ -22,7 +22,7 @@ #ifndef AVCODEC_ROQVIDEO_H #define AVCODEC_ROQVIDEO_H -#include "avcodec.h" +#include "libavutil/frame.h" typedef struct roq_cell { unsigned char y[4]; @@ -39,7 +39,7 @@ typedef struct motion_vect { typedef struct RoqContext { const AVClass *class; - AVCodecContext *avctx; + void *logctx; AVFrame *last_frame; AVFrame *current_frame; int width, height; diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 6f2e48d2f3..bfc69a65c9 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -72,7 +72,7 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) xpos = ypos = 0; if (chunk_size > bytestream2_get_bytes_left(gb)) { - av_log(ri->avctx, AV_LOG_ERROR, "Chunk does not fit in input buffer\n"); + av_log(ri->logctx, AV_LOG_ERROR, "Chunk does not fit in input buffer\n"); chunk_size = bytestream2_get_bytes_left(gb); } @@ -80,7 +80,7 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) for (yp = ypos; yp < ypos + 16; yp += 8) for (xp = xpos; xp < xpos + 16; xp += 8) { if (bytestream2_tell(gb) >= chunk_start + chunk_size) { - av_log(ri->avctx, AV_LOG_VERBOSE, "Chunk is too short\n"); + av_log(ri->logctx, AV_LOG_VERBOSE, "Chunk is too short\n"); return; } if (vqflg_pos < 0) { @@ -114,7 +114,7 @@ static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) if(k & 0x02) y += 4; if (bytestream2_tell(gb) >= chunk_start + chunk_size) { - av_log(ri->avctx, AV_LOG_VERBOSE, "Chunk is too short\n"); + av_log(ri->logctx, AV_LOG_VERBOSE, "Chunk is too short\n"); return; } if (vqflg_pos < 0) { @@ -169,7 +169,7 @@ static av_cold int roq_decode_init(AVCodecContext *avctx) { RoqContext *s = avctx->priv_data; - s->avctx = avctx; + s->logctx = avctx; if (avctx->width % 16 || avctx->height % 16) { avpriv_request_sample(avctx, "Dimensions not being a multiple of 16"); diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index c25aa39b73..0933abf4f9 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -911,10 +911,10 @@ static int roq_encode_video(RoqEncContext *enc) /* Quake 3 can't handle chunks bigger than 65535 bytes */ if (tempData->mainChunkSize/8 > 65535 && enc->quake3_compat) { if (enc->lambda > 100000) { - av_log(roq->avctx, AV_LOG_ERROR, "Cannot encode video in Quake compatible form\n"); + av_log(roq->logctx, AV_LOG_ERROR, "Cannot encode video in Quake compatible form\n"); return AVERROR(EINVAL); } - av_log(roq->avctx, AV_LOG_ERROR, + av_log(roq->logctx, AV_LOG_ERROR, "Warning, generated a frame too big for Quake (%d > 65535), " "now switching to a bigger qscale value.\n", tempData->mainChunkSize/8); @@ -972,7 +972,7 @@ static av_cold int roq_encode_init(AVCodecContext *avctx) av_lfg_init(&enc->randctx, 1); - roq->avctx = avctx; + roq->logctx = avctx; enc->framesSinceKeyframe = 0; if ((avctx->width & 0xf) || (avctx->height & 0xf)) { @@ -1057,8 +1057,6 @@ static int roq_encode_frame(AVCodecContext *avctx, AVPacket *pkt, RoqContext *const roq = &enc->common; int size, ret; - roq->avctx = avctx; - enc->frame_to_enc = frame; if (frame->quality)

1 0

avcodec/sipr: Remove write-only AVCodecContext*
by Andreas Rheinhardt 30 Sep '23

30 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 28 21:24:14 2023 +0200| [7d1401ed02040f6b4ecc429c3b21c96ec86890e9] | committer: Andreas Rheinhardt avcodec/sipr: Remove write-only AVCodecContext* Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d1401ed02040f6b4… --- libavcodec/sipr.c | 1 - libavcodec/sipr.h | 3 --- 2 files changed, 4 deletions(-) diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c index 692b59b3e8..3ddc579f09 100644 --- a/libavcodec/sipr.c +++ b/libavcodec/sipr.c @@ -532,7 +532,6 @@ static int sipr_decode_frame(AVCodecContext *avctx, AVFrame *frame, int subframe_size = ctx->mode == MODE_16k ? L_SUBFR_16k : SUBFR_SIZE; int i, ret; - ctx->avctx = avctx; if (avpkt->size < (mode_par->bits_per_frame >> 3)) { av_log(avctx, AV_LOG_ERROR, "Error processing packet: packet size (%d) too small\n", diff --git a/libavcodec/sipr.h b/libavcodec/sipr.h index e1ef35d658..e7073987ed 100644 --- a/libavcodec/sipr.h +++ b/libavcodec/sipr.h @@ -24,7 +24,6 @@ #ifndef AVCODEC_SIPR_H #define AVCODEC_SIPR_H -#include "avcodec.h" #include "acelp_pitch_delay.h" #include "libavutil/mem_internal.h" @@ -63,8 +62,6 @@ typedef struct SiprParameters { } SiprParameters; typedef struct SiprContext { - AVCodecContext *avctx; - SiprMode mode; float past_pitch_gain;

1 0

avcodec/utvideo: Split UTvideoContext into decoder and encoder contexts
by Andreas Rheinhardt 30 Sep '23

30 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 28 21:16:29 2023 +0200| [b2f5899ec2062f209b9a4d4277910678c6d55f79] | committer: Andreas Rheinhardt avcodec/utvideo: Split UTvideoContext into decoder and encoder contexts In particular the encoder used only a small part of the context: The new encoder context is only 128B here. It used to be 32992. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2f5899ec2062f209… --- libavcodec/utvideo.h | 35 +---------------------------------- libavcodec/utvideodec.c | 27 +++++++++++++++++++++++++++ libavcodec/utvideoenc.c | 18 +++++++++++++++++- 3 files changed, 45 insertions(+), 35 deletions(-) diff --git a/libavcodec/utvideo.h b/libavcodec/utvideo.h index e5160aa394..b081b50a2f 100644 --- a/libavcodec/utvideo.h +++ b/libavcodec/utvideo.h @@ -27,12 +27,7 @@ * Common Ut Video header */ -#include "libavutil/common.h" -#include "avcodec.h" -#include "bswapdsp.h" -#include "utvideodsp.h" -#include "lossless_videodsp.h" -#include "lossless_videoencdsp.h" +#include "libavutil/macros.h" enum { PRED_NONE = 0, @@ -61,32 +56,4 @@ enum { UTVIDEO_444 = MKTAG('Y', 'V', '2', '4'), }; -typedef struct UtvideoContext { - const AVClass *class; - AVCodecContext *avctx; - UTVideoDSPContext utdsp; - BswapDSPContext bdsp; - LLVidDSPContext llviddsp; - LLVidEncDSPContext llvidencdsp; - - uint32_t frame_info_size, flags, frame_info, offset; - int planes; - int slices; - int compression; - int interlaced; - int frame_pred; - int pro; - int pack; - - ptrdiff_t slice_stride; - uint8_t *slice_bits, *slice_buffer[4]; - int slice_bits_size; - void *buffer; - - const uint8_t *packed_stream[4][256]; - size_t packed_stream_size[4][256]; - const uint8_t *control_stream[4][256]; - size_t control_stream_size[4][256]; -} UtvideoContext; - #endif /* AVCODEC_UTVIDEO_H */ diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index 7ee07209d4..16f51e4b47 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -37,8 +37,35 @@ #include "bytestream.h" #include "codec_internal.h" #include "get_bits.h" +#include "lossless_videodsp.h" #include "thread.h" #include "utvideo.h" +#include "utvideodsp.h" + +typedef struct UtvideoContext { + AVCodecContext *avctx; + UTVideoDSPContext utdsp; + BswapDSPContext bdsp; + LLVidDSPContext llviddsp; + + uint32_t frame_info_size, flags, frame_info, offset; + int planes; + int slices; + int compression; + int interlaced; + int frame_pred; + int pro; + int pack; + + uint8_t *slice_bits; + int slice_bits_size; + void *buffer; + + const uint8_t *packed_stream[4][256]; + size_t packed_stream_size[4][256]; + const uint8_t *control_stream[4][256]; + size_t control_stream_size[4][256]; +} UtvideoContext; typedef struct HuffEntry { uint8_t len; diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 6e87bbc2b6..1fcb6854f2 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -33,11 +33,28 @@ #include "encode.h" #include "bswapdsp.h" #include "bytestream.h" +#include "lossless_videoencdsp.h" #include "put_bits.h" #include "mathops.h" #include "utvideo.h" #include "huffman.h" +typedef struct UtvideoContext { + const AVClass *class; + BswapDSPContext bdsp; + LLVidEncDSPContext llvidencdsp; + + uint32_t frame_info_size, flags; + int planes; + int slices; + int compression; + int frame_pred; + + ptrdiff_t slice_stride; + uint8_t *slice_bits, *slice_buffer[4]; + int slice_bits_size; +} UtvideoContext; + typedef struct HuffEntry { uint16_t sym; uint8_t len; @@ -76,7 +93,6 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx) int i, subsampled_height; uint32_t original_format; - c->avctx = avctx; c->frame_info_size = 4; c->slice_stride = FFALIGN(avctx->width, 32);

1 0

avcodec/vorbis: Use void* logctx instead of AVCodecContext*
by Andreas Rheinhardt 30 Sep '23

30 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Sep 28 21:01:34 2023 +0200| [0e18f1e9a3c1abefc0a945727490550427cee2cb] | committer: Andreas Rheinhardt avcodec/vorbis: Use void* logctx instead of AVCodecContext* Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e18f1e9a3c1abefc… --- libavcodec/vorbis.c | 8 +++++--- libavcodec/vorbis.h | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index d0b660b44a..3d85997576 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -27,8 +27,10 @@ */ #include "libavutil/common.h" +#include "libavutil/error.h" +#include "libavutil/log.h" +#include "libavutil/macros.h" -#include "avcodec.h" #include "vorbis.h" #include "vorbis_data.h" @@ -104,7 +106,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) return 0; } -int ff_vorbis_ready_floor1_list(AVCodecContext *avctx, +int ff_vorbis_ready_floor1_list(void *logctx, vorbis_floor1_entry *list, int values) { int i; @@ -130,7 +132,7 @@ int ff_vorbis_ready_floor1_list(AVCodecContext *avctx, int j; for (j = i + 1; j < values; j++) { if (list[i].x == list[j].x) { - av_log(avctx, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "Duplicate value found in floor 1 X coordinates\n"); return AVERROR_INVALIDDATA; } diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h index aa1ec5719d..7190465f0d 100644 --- a/libavcodec/vorbis.h +++ b/libavcodec/vorbis.h @@ -23,8 +23,6 @@ #include <stdint.h> -#include "avcodec.h" - typedef struct vorbis_floor1_entry { uint16_t x; uint16_t sort; @@ -32,7 +30,7 @@ typedef struct vorbis_floor1_entry { uint16_t high; } vorbis_floor1_entry; -int ff_vorbis_ready_floor1_list(AVCodecContext *avctx, +int ff_vorbis_ready_floor1_list(void *logctx, vorbis_floor1_entry *list, int values); unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n); // x^(1/n) int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num);

1 0

avcodec/ffv1dec: Reindent after the previous commit
by Andreas Rheinhardt 30 Sep '23

30 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Wed Apr 21 19:37:12 2021 +0200| [bdbf9aa402dd77d93cc80995ad7904f519651b54] | committer: Andreas Rheinhardt avcodec/ffv1dec: Reindent after the previous commit Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bdbf9aa402dd77d93… --- libavcodec/ffv1dec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 95beae09ad..a376a4c817 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -1078,13 +1078,13 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) sizeof(fdst->state_transition)); memcpy(fdst->quant_table, fsrc->quant_table, sizeof(fsrc->quant_table)); - for (i = 0; i<fdst->num_h_slices * fdst->num_v_slices; i++) { - FFV1Context *fssrc = fsrc->slice_context[i]; - FFV1Context *fsdst = fdst->slice_context[i]; - copy_fields(fsdst, fssrc, fsrc); - } - av_assert0(!fdst->plane[0].state); - av_assert0(!fdst->sample_buffer); + for (i = 0; i < fdst->num_h_slices * fdst->num_v_slices; i++) { + FFV1Context *fssrc = fsrc->slice_context[i]; + FFV1Context *fsdst = fdst->slice_context[i]; + copy_fields(fsdst, fssrc, fsrc); + } + av_assert0(!fdst->plane[0].state); + av_assert0(!fdst->sample_buffer); av_assert1(fdst->max_slice_count == fsrc->max_slice_count);

1 0

avcodec/ffv1dec: Fix data races emanating from copying whole context
by Andreas Rheinhardt 30 Sep '23

30 Sep '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Wed Apr 21 19:25:22 2021 +0200| [0cfc7418bbf55f7b316862598c4e59434c65b3a8] | committer: Andreas Rheinhardt avcodec/ffv1dec: Fix data races emanating from copying whole context When using frame threading, the FFV1 decoder's update_thread_context() function copies the whole context and afterwards restores some allocated fields with backups made earlier. Among these fields are the ThreadFrames and the source context's ThreadFrames can change concurrently without any synchronization, leading to data races which are undefined behaviour even if they don't lead to problems in practice (as the destination's own ThreadFrames are restored directly thereafter). Fix this by only copying the actually needed fields. Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cfc7418bbf55f7b3… --- libavcodec/ffv1dec.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index cdf72a25dd..95beae09ad 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -1072,18 +1072,12 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) if (dst == src) return 0; - { - ThreadFrame picture = fdst->picture, last_picture = fdst->last_picture; - uint8_t (*initial_states[MAX_QUANT_TABLES])[32]; - struct FFV1Context *slice_context[MAX_SLICES]; - memcpy(initial_states, fdst->initial_states, sizeof(fdst->initial_states)); - memcpy(slice_context, fdst->slice_context , sizeof(fdst->slice_context)); - - memcpy(fdst, fsrc, sizeof(*fdst)); - memcpy(fdst->initial_states, initial_states, sizeof(fdst->initial_states)); - memcpy(fdst->slice_context, slice_context , sizeof(fdst->slice_context)); - fdst->picture = picture; - fdst->last_picture = last_picture; + copy_fields(fdst, fsrc, fsrc); + fdst->use32bit = fsrc->use32bit; + memcpy(fdst->state_transition, fsrc->state_transition, + sizeof(fdst->state_transition)); + memcpy(fdst->quant_table, fsrc->quant_table, sizeof(fsrc->quant_table)); + for (i = 0; i<fdst->num_h_slices * fdst->num_v_slices; i++) { FFV1Context *fssrc = fsrc->slice_context[i]; FFV1Context *fsdst = fdst->slice_context[i]; @@ -1091,7 +1085,6 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) } av_assert0(!fdst->plane[0].state); av_assert0(!fdst->sample_buffer); - } av_assert1(fdst->max_slice_count == fsrc->max_slice_count);

1 0

avcodec/decode: reduce scope of a variable in ff_decode_frame_props()
by James Almer 30 Sep '23

30 Sep '23

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sat Sep 30 11:14:32 2023 -0300| [5ba06ad0b87740080a7bc7ddf58c5a65c24c9262] | committer: James Almer avcodec/decode: reduce scope of a variable in ff_decode_frame_props() Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5ba06ad0b87740080… --- libavcodec/decode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 466c393c1e..e708d74cbf 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1476,10 +1476,11 @@ FF_ENABLE_DEPRECATION_WARNINGS int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) { - const AVPacket *pkt = avctx->internal->last_pkt_props; int ret; if (!(ffcodec(avctx->codec)->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS)) { + const AVPacket *pkt = avctx->internal->last_pkt_props; + ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt); if (ret < 0) return ret;

1 0