virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/jpeglsdec: Don't allocate+free JPEGLSState for every frame

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-04-14 21:24:33 +02:00
parent 5627da3555
commit 9b3c46a081
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/jpeglsdec.c
View File

@@ -45,6 +45,11 @@
*/ */
//#define JLS_BROKEN //#define JLS_BROKEN
typedef struct JpegLSDecodeContext {
MJpegDecodeContext mjpeg;
JLSState state;
} JpegLSDecodeContext;
/** /**
* Decode LSE block with initialization parameters * Decode LSE block with initialization parameters
*/ */
@@ -350,7 +355,7 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
{ {
int i, t = 0; int i, t = 0;
uint8_t *zero, *last, *cur; uint8_t *zero, *last, *cur;
JLSState *state; JLSState *const state = &((JpegLSDecodeContext*)s)->state;
int off = 0, stride = 1, width, shift, ret = 0; int off = 0, stride = 1, width, shift, ret = 0;
int decoded_height = 0; int decoded_height = 0;
@@ -360,12 +365,8 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
last = zero; last = zero;
cur = s->picture_ptr->data[0]; cur = s->picture_ptr->data[0];
state = av_mallocz(sizeof(JLSState));
if (!state) {
av_free(zero);
return AVERROR(ENOMEM);
}
/* initialize JPEG-LS state from JPEG parameters */ /* initialize JPEG-LS state from JPEG parameters */
memset(state, 0, sizeof(*state));
state->near = near; state->near = near;
state->bpp = (s->bits < 2) ? 2 : s->bits; state->bpp = (s->bits < 2) ? 2 : s->bits;
state->maxval = s->maxval; state->maxval = s->maxval;
@@ -537,7 +538,6 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
} }
end: end:
av_free(state);
av_free(zero); av_free(zero);
return ret; return ret;
@@ -548,7 +548,7 @@ AVCodec ff_jpegls_decoder = {
.long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"), .long_name = NULL_IF_CONFIG_SMALL("JPEG-LS"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_JPEGLS, .id = AV_CODEC_ID_JPEGLS,
.priv_data_size = sizeof(MJpegDecodeContext), .priv_data_size = sizeof(JpegLSDecodeContext),
.init = ff_mjpeg_decode_init, .init = ff_mjpeg_decode_init,
.close = ff_mjpeg_decode_end, .close = ff_mjpeg_decode_end,
.receive_frame = ff_mjpeg_receive_frame, .receive_frame = ff_mjpeg_receive_frame,