RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/proresdec2: Constify slice threads' ptr to main context 

Modifying the main context from a slice thread is (usually)
a data race, so it must not happen. So only use a pointer to const
to access the main context.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-07-23 06:11:35 +02:00
parent 9c4f7d1e88
commit 0eae123dbd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/proresdec2.c
View File

@ -500,7 +500,7 @@ static const uint8_t lev_to_cb[10] = { 0x04, 0x0A, 0x05, 0x06, 0x04, 0x28, 0x28,
static av_always_inline int decode_ac_coeffs(AVCodecContext *avctx, GetBitContext *gb, static av_always_inline int decode_ac_coeffs(AVCodecContext *avctx, GetBitContext *gb,
int16_t *out, int blocks_per_slice) int16_t *out, int blocks_per_slice)
{ {
ProresContext *ctx = avctx->priv_data; const ProresContext *ctx = avctx->priv_data;
int block_mask, sign; int block_mask, sign;
unsigned pos, run, level; unsigned pos, run, level;
int max_coeffs, i, bits_left; int max_coeffs, i, bits_left;
@ -545,7 +545,7 @@ static int decode_slice_luma(AVCodecContext *avctx, SliceContext *slice,
const uint8_t *buf, unsigned buf_size, const uint8_t *buf, unsigned buf_size,
const int16_t *qmat) const int16_t *qmat)
{ {
ProresContext *ctx = avctx->priv_data; const ProresContext *ctx = avctx->priv_data;
LOCAL_ALIGNED_32(int16_t, blocks, [8*4*64]); LOCAL_ALIGNED_32(int16_t, blocks, [8*4*64]);
int16_t *block; int16_t *block;
GetBitContext gb; GetBitContext gb;
@ -611,7 +611,7 @@ static int decode_slice_chroma(AVCodecContext *avctx, SliceContext *slice,
/** /**
* Decode alpha slice plane. * Decode alpha slice plane.
*/ */
static void decode_slice_alpha(ProresContext *ctx, static void decode_slice_alpha(const ProresContext *ctx,
uint16_t *dst, int dst_stride, uint16_t *dst, int dst_stride,
const uint8_t *buf, int buf_size, const uint8_t *buf, int buf_size,
int blocks_per_slice) int blocks_per_slice)
@ -643,7 +643,7 @@ static void decode_slice_alpha(ProresContext *ctx,
static int decode_slice_thread(AVCodecContext *avctx, void *arg, int jobnr, int threadnr) static int decode_slice_thread(AVCodecContext *avctx, void *arg, int jobnr, int threadnr)
{ {
ProresContext *ctx = avctx->priv_data; const ProresContext *ctx = avctx->priv_data;
SliceContext *slice = &ctx->slices[jobnr]; SliceContext *slice = &ctx->slices[jobnr];
const uint8_t *buf = slice->data; const uint8_t *buf = slice->data;
AVFrame *pic = ctx->frame; AVFrame *pic = ctx->frame;