virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/mjpegenc: Simplify allocating huffman table

Browse Source 
Reuse the already computed value of macroblocks; use an array
instead of a switch, evaluate 64 * sizeof(MJpegHuffmanCode)
at compile-time.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-03 02:36:55 +01:00
parent dcd4daee8c
commit 24dbc4c2e8
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/mjpegenc.c
View File

@ -277,25 +277,21 @@ fail:
return ret; return ret;
} }
static int alloc_huffman(MpegEncContext *s) static int alloc_huffman(MJPEGEncContext *const m2)
{ {
MJpegContext *m = s->mjpeg_ctx; MJpegContext *const m = &m2->mjpeg;
size_t num_mbs, num_blocks, num_codes; MpegEncContext *const s = &m2->mpeg.s;
int blocks_per_mb; static const char blocks_per_mb[] = {
[CHROMA_420] = 6, [CHROMA_422] = 8, [CHROMA_444] = 12
switch (s->chroma_format) {
case CHROMA_420: blocks_per_mb = 6; break;
case CHROMA_422: blocks_per_mb = 8; break;
case CHROMA_444: blocks_per_mb = 12; break;
default: av_assert0(0);
}; };
size_t num_blocks, num_codes;
// Make sure we have enough space to hold this frame. // Make sure we have enough space to hold this frame.
num_mbs = s->mb_width * s->mb_height; num_blocks = s->mb_num * blocks_per_mb[s->chroma_format];
num_blocks = num_mbs * blocks_per_mb;
num_codes = num_blocks * 64; num_codes = num_blocks * 64;
m->huff_buffer = av_malloc_array(num_codes, sizeof(MJpegHuffmanCode)); m->huff_buffer = av_malloc_array(num_codes,
64 /* codes per MB */ * sizeof(MJpegHuffmanCode));
if (!m->huff_buffer) if (!m->huff_buffer)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
return 0; return 0;
@ -369,7 +365,7 @@ static av_cold int mjpeg_encode_init(AVCodecContext *avctx)
m->huffman = HUFFMAN_TABLE_DEFAULT; m->huffman = HUFFMAN_TABLE_DEFAULT;
if (m->huffman == HUFFMAN_TABLE_OPTIMAL) if (m->huffman == HUFFMAN_TABLE_OPTIMAL)
return alloc_huffman(s); return alloc_huffman(m2);
return 0; return 0;
} }