highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/smcenc: Move PutByteContext to stack

Browse Source 
This context is transient, so putting it on the stack is more natural.
Also reduces codesize: 24E6->2296 B with GCC 10 and -O3.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-11-19 21:44:05 +01:00
parent b159975e80
commit 40cf317d09
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/smcenc.c
View File

@@ -39,7 +39,6 @@
typedef struct SMCContext { typedef struct SMCContext {
AVFrame *prev_frame; // buffer for previous source frame AVFrame *prev_frame; // buffer for previous source frame
PutByteContext pb;
uint8_t mono_value; uint8_t mono_value;
int nb_distinct; int nb_distinct;
@@ -110,9 +109,9 @@ static int count_distinct_items(const uint8_t *block_values,
s->color_octets[i][6] == distinct_values[x] || \ s->color_octets[i][6] == distinct_values[x] || \
s->color_octets[i][7] == distinct_values[x]) s->color_octets[i][7] == distinct_values[x])
static void smc_encode_stream(SMCContext *s, const AVFrame *frame) static void smc_encode_stream(SMCContext *s, const AVFrame *frame,
PutByteContext *pb)
{ {
PutByteContext *pb = &s->pb;
const uint8_t *src_pixels = (const uint8_t *)frame->data[0]; const uint8_t *src_pixels = (const uint8_t *)frame->data[0];
const int stride = frame->linesize[0]; const int stride = frame->linesize[0];
const uint8_t *prev_pixels = (const uint8_t *)s->prev_frame->data[0]; const uint8_t *prev_pixels = (const uint8_t *)s->prev_frame->data[0];
@@ -492,6 +491,7 @@ static int smc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
{ {
SMCContext *s = avctx->priv_data; SMCContext *s = avctx->priv_data;
const AVFrame *pict = frame; const AVFrame *pict = frame;
PutByteContext pb;
uint8_t *pal; uint8_t *pal;
int ret; int ret;
@@ -506,18 +506,18 @@ static int smc_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
s->key_frame = 0; s->key_frame = 0;
} }
bytestream2_init_writer(&s->pb, pkt->data, pkt->size); bytestream2_init_writer(&pb, pkt->data, pkt->size);
bytestream2_put_be32(&s->pb, 0x00); bytestream2_put_be32(&pb, 0x00);
pal = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE, AVPALETTE_SIZE); pal = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE, AVPALETTE_SIZE);
if (!pal) if (!pal)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
memcpy(pal, frame->data[1], AVPALETTE_SIZE); memcpy(pal, frame->data[1], AVPALETTE_SIZE);
smc_encode_stream(s, pict); smc_encode_stream(s, pict, &pb);
av_shrink_packet(pkt, bytestream2_tell_p(&s->pb)); av_shrink_packet(pkt, bytestream2_tell_p(&pb));
pkt->data[0] = 0x0; pkt->data[0] = 0x0;