virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity

ffv1enc_vulkan: remove arbitrary limitation of the number of slices

Browse Source
This commit is contained in:
Lynne 2024-11-21 19:56:23 +01:00
parent ce8a070cf3
commit 4fefc6e80c
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/ffv1enc_vulkan.c
View File

@ -1388,13 +1388,24 @@ static av_cold int vulkan_encode_ffv1_init(AVCodecContext *avctx)
f->num_h_slices = fv->num_h_slices;
f->num_v_slices = fv->num_v_slices;
if (f->num_h_slices <= 0)
if (f->num_h_slices <= 0 && f->num_v_slices <= 0) {
f->num_h_slices = 32;
if (f->num_v_slices <= 0)
f->num_v_slices = 32;
} else if (f->num_h_slices && f->num_v_slices <= 0) {
f->num_v_slices = 1024 / f->num_h_slices;
} else if (f->num_v_slices && f->num_h_slices <= 0) {
f->num_h_slices = 1024 / f->num_v_slices;
}
f->num_h_slices = FFMIN(f->num_h_slices, avctx->width);
f->num_v_slices = FFMIN(f->num_v_slices, avctx->height);
if (f->num_h_slices * f->num_v_slices > 1024) {
av_log(avctx, AV_LOG_ERROR, "Too many slices (%i), maximum supported "
"by the standard is 1024\n",
f->num_h_slices * f->num_v_slices);
return AVERROR_PATCHWELCOME;
}
}
if ((err = ff_ffv1_write_extradata(avctx)) < 0)
@ -1549,9 +1560,9 @@ static const AVOption vulkan_encode_ffv1_options[] = {
{ .i64 = -1 }, -1, 2, VE },
{ "slices_h", "Number of horizontal slices", OFFSET(num_h_slices), AV_OPT_TYPE_INT,
{ .i64 = -1 }, -1, 32, VE },
{ .i64 = -1 }, -1, 1024, VE },
{ "slices_v", "Number of vertical slices", OFFSET(num_v_slices), AV_OPT_TYPE_INT,
{ .i64 = -1 }, -1, 32, VE },
{ .i64 = -1 }, -1, 1024, VE },
{ "force_pcm", "Code all slices with no prediction", OFFSET(force_pcm), AV_OPT_TYPE_BOOL,
{ .i64 = 0 }, 0, 1, VE },