wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avcodec/mjpegdec: avoid indirection when accessing avctx

Browse source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2023-11-26 21:40:27 +01:00
parent e6b9bfaac3
commit 059ea1d6f6
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
libavcodec/mjpegdec.c
View file

@ -2422,7 +2422,7 @@ redo_for_pal8:
} }
s->start_code = start_code; s->start_code = start_code;
if (s->avctx->debug & FF_DEBUG_STARTCODE) if (avctx->debug & FF_DEBUG_STARTCODE)
av_log(avctx, AV_LOG_DEBUG, "startcode: %X\n", start_code); av_log(avctx, AV_LOG_DEBUG, "startcode: %X\n", start_code);
/* process markers */ /* process markers */
@ -2486,9 +2486,9 @@ redo_for_pal8:
case SOF0: case SOF0:
case SOF1: case SOF1:
if (start_code == SOF0) if (start_code == SOF0)
s->avctx->profile = AV_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT; avctx->profile = AV_PROFILE_MJPEG_HUFFMAN_BASELINE_DCT;
else else
s->avctx->profile = AV_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT; avctx->profile = AV_PROFILE_MJPEG_HUFFMAN_EXTENDED_SEQUENTIAL_DCT;
s->lossless = 0; s->lossless = 0;
s->ls = 0; s->ls = 0;
s->progressive = 0; s->progressive = 0;
@ -2496,7 +2496,7 @@ redo_for_pal8:
goto fail; goto fail;
break; break;
case SOF2: case SOF2:
s->avctx->profile = AV_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT; avctx->profile = AV_PROFILE_MJPEG_HUFFMAN_PROGRESSIVE_DCT;
s->lossless = 0; s->lossless = 0;
s->ls = 0; s->ls = 0;
s->progressive = 1; s->progressive = 1;
@ -2504,8 +2504,8 @@ redo_for_pal8:
goto fail; goto fail;
break; break;
case SOF3: case SOF3:
s->avctx->profile = AV_PROFILE_MJPEG_HUFFMAN_LOSSLESS; avctx->profile = AV_PROFILE_MJPEG_HUFFMAN_LOSSLESS;
s->avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS;
s->lossless = 1; s->lossless = 1;
s->ls = 0; s->ls = 0;
s->progressive = 0; s->progressive = 0;
@ -2513,8 +2513,8 @@ redo_for_pal8:
goto fail; goto fail;
break; break;
case SOF48: case SOF48:
s->avctx->profile = AV_PROFILE_MJPEG_JPEG_LS; avctx->profile = AV_PROFILE_MJPEG_JPEG_LS;
s->avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS;
s->lossless = 1; s->lossless = 1;
s->ls = 1; s->ls = 1;
s->progressive = 0; s->progressive = 0;
@ -2549,8 +2549,8 @@ eoi_parser:
s->got_picture = 0; s->got_picture = 0;
goto the_end_no_picture; goto the_end_no_picture;
} }
if (s->avctx->hwaccel) { if (avctx->hwaccel) {
ret = FF_HW_SIMPLE_CALL(s->avctx, end_frame); ret = FF_HW_SIMPLE_CALL(avctx, end_frame);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -2621,7 +2621,7 @@ fail:
return ret; return ret;
the_end: the_end:
is16bit = av_pix_fmt_desc_get(s->avctx->pix_fmt)->comp[0].step > 1; is16bit = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].step > 1;
if (AV_RB32(s->upscale_h)) { if (AV_RB32(s->upscale_h)) {
int p; int p;
@ -2640,7 +2640,7 @@ the_end:
avctx->pix_fmt == AV_PIX_FMT_GBRP || avctx->pix_fmt == AV_PIX_FMT_GBRP ||
avctx->pix_fmt == AV_PIX_FMT_GBRAP avctx->pix_fmt == AV_PIX_FMT_GBRAP
); );
ret = av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt, &hshift, &vshift); ret = av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &hshift, &vshift);
if (ret) if (ret)
return ret; return ret;
@ -2720,7 +2720,7 @@ the_end:
avctx->pix_fmt == AV_PIX_FMT_GBRP || avctx->pix_fmt == AV_PIX_FMT_GBRP ||
avctx->pix_fmt == AV_PIX_FMT_GBRAP avctx->pix_fmt == AV_PIX_FMT_GBRAP
); );
ret = av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt, &hshift, &vshift); ret = av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &hshift, &vshift);
if (ret) if (ret)
return ret; return ret;
@ -2750,7 +2750,7 @@ the_end:
} }
} }
if (s->flipped && !s->rgb) { if (s->flipped && !s->rgb) {
ret = av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt, &hshift, &vshift); ret = av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &hshift, &vshift);
if (ret) if (ret)
return ret; return ret;
@ -2766,7 +2766,7 @@ the_end:
} }
} }
if (s->avctx->pix_fmt == AV_PIX_FMT_GBRP) { if (avctx->pix_fmt == AV_PIX_FMT_GBRP) {
av_assert0(s->nb_components == 3); av_assert0(s->nb_components == 3);
FFSWAP(uint8_t *, frame->data[0], frame->data[2]); FFSWAP(uint8_t *, frame->data[0], frame->data[2]);
FFSWAP(uint8_t *, frame->data[0], frame->data[1]); FFSWAP(uint8_t *, frame->data[0], frame->data[1]);
@ -2774,7 +2774,7 @@ the_end:
FFSWAP(int, frame->linesize[0], frame->linesize[1]); FFSWAP(int, frame->linesize[0], frame->linesize[1]);
} }
if (s->adobe_transform == 0 && s->avctx->pix_fmt == AV_PIX_FMT_GBRAP) { if (s->adobe_transform == 0 && avctx->pix_fmt == AV_PIX_FMT_GBRAP) {
int w = s->picture_ptr->width; int w = s->picture_ptr->width;
int h = s->picture_ptr->height; int h = s->picture_ptr->height;
av_assert0(s->nb_components == 4); av_assert0(s->nb_components == 4);
@ -2797,7 +2797,7 @@ the_end:
memset(dst[3], 255, w); memset(dst[3], 255, w);
} }
} }
if (s->adobe_transform == 2 && s->avctx->pix_fmt == AV_PIX_FMT_YUVA444P) { if (s->adobe_transform == 2 && avctx->pix_fmt == AV_PIX_FMT_YUVA444P) {
int w = s->picture_ptr->width; int w = s->picture_ptr->width;
int h = s->picture_ptr->height; int h = s->picture_ptr->height;
av_assert0(s->nb_components == 4); av_assert0(s->nb_components == 4);
@ -2842,7 +2842,7 @@ the_end:
sd = av_frame_new_side_data(frame, AV_FRAME_DATA_ICC_PROFILE, total_size); sd = av_frame_new_side_data(frame, AV_FRAME_DATA_ICC_PROFILE, total_size);
if (!sd) { if (!sd) {
av_log(s->avctx, AV_LOG_ERROR, "Could not allocate frame side data\n"); av_log(avctx, AV_LOG_ERROR, "Could not allocate frame side data\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -2865,7 +2865,7 @@ the_end:
sd = av_frame_new_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX, sizeof(int32_t) * 9); sd = av_frame_new_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX, sizeof(int32_t) * 9);
if (!sd) { if (!sd) {
av_log(s->avctx, AV_LOG_ERROR, "Could not allocate frame side data\n"); av_log(avctx, AV_LOG_ERROR, "Could not allocate frame side data\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }