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/ffv1: Allocate unit only when needed and only as large as needed

Browse Source 
That is instead of a fixed 65536, we now allocate only as many as there
are pixels.
We also allocate only for the encoder and only when remapping is enabled
and only for 32bit per sample

This should reduce memory consumption, the 2nd array will be
dealt with in a future commit

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2025-04-02 02:24:58 +02:00
parent f1235f4bc1
commit b67cf79683
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ffv1.h
View File

@ -114,7 +114,7 @@ typedef struct FFV1SliceContext {
struct Unit {
uint32_t val; //this is unneeded if you accept a dereference on each access
uint16_t ndx;
} unit[4][65536];
} *unit[4];
} FFV1SliceContext;
typedef struct FFV1Context {

17
libavcodec/ffv1enc.c
View File

@ -1003,12 +1003,22 @@ static av_cold int encode_init_internal(AVCodecContext *avctx)
s->slice_count = s->max_slice_count;
for (int j = 0; j < s->slice_count; j++) {
FFV1SliceContext *sc = &s->slices[j];
for (int i = 0; i < s->plane_count; i++) {
PlaneContext *const p = &s->slices[j].plane[i];
p->quant_table_index = s->context_model;
p->context_count = s->context_count[p->quant_table_index];
}
av_assert0(s->remap_mode >= 0);
if (s->remap_mode && s->bits_per_raw_sample == 32) {
for (int p = 0; p < 1 + 2*s->chroma_planes + s->transparency ; p++) {
sc->unit[p] = av_malloc_array(sc->slice_width, sc->slice_height * sizeof(**sc->unit));
if (!sc->unit[p])
return AVERROR(ENOMEM);
}
}
ff_build_rac_states(&s->slices[j].c, 0.05 * (1LL << 32), 256 - 8);
@ -1808,6 +1818,13 @@ static av_cold int encode_close(AVCodecContext *avctx)
{
FFV1Context *const s = avctx->priv_data;
for (int j = 0; j < s->max_slice_count; j++) {
FFV1SliceContext *sc = &s->slices[j];
for(int p = 0; p<4; p++)
av_freep(&sc->unit[p]);
}
av_freep(&avctx->stats_out);
ff_ffv1_close(s);