RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-23 15:53:08 +00:00
Code Issues Projects Releases Wiki Activity

ffv1enc: move slice allocation out of generic encode init

Browse Source
This commit is contained in:
Lynne 2024-10-13 12:07:27 +02:00
parent 12ea1cde57
commit a6c58353ac
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libavcodec/ffv1enc.c
View File

@ -738,32 +738,8 @@ av_cold int ff_ffv1_encode_init(AVCodecContext *avctx)
/* Disable slices when the version doesn't support them */
s->num_h_slices = 1;
s->num_v_slices = 1;
} else {
if ((ret = encode_determine_slices(avctx)) < 0)
return ret;
if ((ret = ff_ffv1_write_extradata(avctx)) < 0)
return ret;
}
if ((ret = ff_ffv1_init_slice_contexts(s)) < 0)
return ret;
s->slice_count = s->max_slice_count;
for (int j = 0; j < s->slice_count; 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];
}
ff_build_rac_states(&s->slices[j].c, 0.05 * (1LL << 32), 256 - 8);
}
if ((ret = ff_ffv1_init_slices_state(s)) < 0)
return ret;
return 0;
}
@ -942,6 +918,30 @@ static int encode_init_internal(AVCodecContext *avctx)
if (ret < 0)
return ret;
if ((ret = encode_determine_slices(avctx)) < 0)
return ret;
if ((ret = ff_ffv1_write_extradata(avctx)) < 0)
return ret;
if ((ret = ff_ffv1_init_slice_contexts(s)) < 0)
return ret;
s->slice_count = s->max_slice_count;
for (int j = 0; j < s->slice_count; 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];
}
ff_build_rac_states(&s->slices[j].c, 0.05 * (1LL << 32), 256 - 8);
}
if ((ret = ff_ffv1_init_slices_state(s)) < 0)
return ret;
#define STATS_OUT_SIZE 1024 * 1024 * 6
if (avctx->flags & AV_CODEC_FLAG_PASS1) {
avctx->stats_out = av_mallocz(STATS_OUT_SIZE);