github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 21:00:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/mjpegdec: remove start_code field from MJpegDecodeContext

Browse Source 
Instead, pass it as a parameter to the only function that uses it.
This commit is contained in:
Ramiro Polla
2025-09-11 17:45:47 +02:00
parent 1218a8a922
commit 9ee6136ece
3 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mjpegbdec.c
View File

@@ -85,7 +85,6 @@ read_header:
av_log(avctx, AV_LOG_DEBUG, "dqt offs: 0x%"PRIx32"\n", dqt_offs);
if (dqt_offs) {
bytestream2_init(&s->gB, buf_ptr+dqt_offs, buf_end - (buf_ptr+dqt_offs));
s->start_code = DQT;
ret = ff_mjpeg_decode_dqt(s);
if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE))
return ret;
@@ -95,7 +94,6 @@ read_header:
av_log(avctx, AV_LOG_DEBUG, "dht offs: 0x%"PRIx32"\n", dht_offs);
if (dht_offs) {
bytestream2_init(&s->gB, buf_ptr+dht_offs, buf_end - (buf_ptr+dht_offs));
s->start_code = DHT;
ff_mjpeg_decode_dht(s);
}
@@ -103,7 +101,6 @@ read_header:
av_log(avctx, AV_LOG_DEBUG, "sof offs: 0x%"PRIx32"\n", sof_offs);
if (sof_offs) {
bytestream2_init(&s->gB, buf_ptr+sof_offs, buf_end - (buf_ptr+sof_offs));
s->start_code = SOF0;
if ((ret = ff_mjpeg_decode_sof(s)) < 0)
return ret;
}
@@ -116,7 +113,6 @@ read_header:
bytestream2_init(&s->gB, buf_ptr+sos_offs,
FFMIN(field_size, buf_end - buf_ptr - sos_offs));
s->mjpb_skiptosod = (sod_offs - sos_offs - bytestream2_peek_be16(&s->gB));
s->start_code = SOS;
if (avctx->skip_frame == AVDISCARD_ALL) {
bytestream2_skipu(&s->gB, bytestream2_get_bytes_left(&s->gB));
} else {

14
libavcodec/mjpegdec.c
View File

@@ -134,7 +134,6 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
init_idct(avctx);
s->buffer_size = 0;
s->buffer = NULL;
s->start_code = -1;
s->first_picture = 1;
s->got_picture = 0;
s->orig_height = avctx->coded_height;
@@ -1866,7 +1865,7 @@ static int mjpeg_decode_dri(MJpegDecodeContext *s)
return 0;
}
static int mjpeg_decode_app(MJpegDecodeContext *s)
static int mjpeg_decode_app(MJpegDecodeContext *s, int start_code)
{
int len, id, i;
@@ -2013,7 +2012,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
}
/* JPS extension by VRex */
if (s->start_code == APP3 && id == AV_RB32("_JPS") && len >= 10) {
if (start_code == APP3 && id == AV_RB32("_JPS") && len >= 10) {
int flags, layout, type;
if (s->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(s->avctx, AV_LOG_INFO, "_JPSJPS_\n");
@@ -2053,7 +2052,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
}
/* EXIF metadata */
if (s->start_code == APP1 && id == AV_RB32("Exif") && len >= 2) {
if (start_code == APP1 && id == AV_RB32("Exif") && len >= 2) {
int ret;
bytestream2_skipu(&s->gB, 2); // skip padding
@@ -2072,7 +2071,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
}
/* Apple MJPEG-A */
if ((s->start_code == APP1) && (len > (0x28 - 8))) {
if ((start_code == APP1) && (len > (0x28 - 8))) {
id = bytestream2_get_be32u(&s->gB);
len -= 4;
/* Apple MJPEG-A */
@@ -2092,7 +2091,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
}
}
if (s->start_code == APP2 && id == AV_RB32("ICC_") && len >= 10) {
if (start_code == APP2 && id == AV_RB32("ICC_") && len >= 10) {
int id2;
unsigned seqno;
unsigned nummarkers;
@@ -2418,7 +2417,6 @@ redo_for_pal8:
bytestream2_init(&s->gB, unescaped_buf_ptr, unescaped_buf_size);
s->start_code = start_code;
if (avctx->debug & FF_DEBUG_STARTCODE)
av_log(avctx, AV_LOG_DEBUG, "startcode: %X\n", start_code);
@@ -2428,7 +2426,7 @@ redo_for_pal8:
"restart marker: %d\n", start_code & 0x0f);
/* APP fields */
} else if (start_code >= APP0 && start_code <= APP15) {
if ((ret = mjpeg_decode_app(s)) < 0)
if ((ret = mjpeg_decode_app(s, start_code)) < 0)
av_log(avctx, AV_LOG_ERROR, "unable to decode APP fields: %s\n",
av_err2str(ret));
/* Comment */

1
libavcodec/mjpegdec.h
View File

@@ -60,7 +60,6 @@ typedef struct MJpegDecodeContext {
GetByteContext gB;
int buf_size;
int start_code; /* current start code */
int buffer_size;
uint8_t *buffer;