1berry/FFmpeg
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ffv1enc_vulkan: allow setting the number of slices via -slices

Browse Source 
Falls back to the exact same code the software encoder uses.
This commit is contained in:
Lynne 2024-12-25 19:23:23 +09:00
parent d9b773c22f
commit e7b474783c
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ffv1enc.c
View File

@ -516,7 +516,7 @@ static int sort_stt(FFV1Context *s, uint8_t stt[256])
} }
static int encode_determine_slices(AVCodecContext *avctx) int ff_ffv1_encode_determine_slices(AVCodecContext *avctx)
{ {
FFV1Context *s = avctx->priv_data; FFV1Context *s = avctx->priv_data;
int plane_count = 1 + 2*s->chroma_planes + s->transparency; int plane_count = 1 + 2*s->chroma_planes + s->transparency;
@ -919,7 +919,7 @@ static int encode_init_internal(AVCodecContext *avctx)
return ret; return ret;
if (s->version > 1) { if (s->version > 1) {
if ((ret = encode_determine_slices(avctx)) < 0) if ((ret = ff_ffv1_encode_determine_slices(avctx)) < 0)
return ret; return ret;
if ((ret = ff_ffv1_write_extradata(avctx)) < 0) if ((ret = ff_ffv1_write_extradata(avctx)) < 0)

1
libavcodec/ffv1enc.h
View File

@ -32,6 +32,7 @@ enum {
}; };
av_cold int ff_ffv1_encode_init(AVCodecContext *avctx); av_cold int ff_ffv1_encode_init(AVCodecContext *avctx);
av_cold int ff_ffv1_encode_determine_slices(AVCodecContext *avctx);
av_cold int ff_ffv1_write_extradata(AVCodecContext *avctx); av_cold int ff_ffv1_write_extradata(AVCodecContext *avctx);
av_cold int ff_ffv1_encode_setup_plane_info(AVCodecContext *avctx, av_cold int ff_ffv1_encode_setup_plane_info(AVCodecContext *avctx,
enum AVPixelFormat pix_fmt); enum AVPixelFormat pix_fmt);

10
libavcodec/ffv1enc_vulkan.c
View File

@ -1540,8 +1540,14 @@ static av_cold int vulkan_encode_ffv1_init(AVCodecContext *avctx)
f->num_v_slices = fv->num_v_slices; f->num_v_slices = fv->num_v_slices;
if (f->num_h_slices <= 0 && f->num_v_slices <= 0) { if (f->num_h_slices <= 0 && f->num_v_slices <= 0) {
f->num_h_slices = 32; if (avctx->slices) {
f->num_v_slices = 32; err = ff_ffv1_encode_determine_slices(avctx);
if (err < 0)
return err;
} else {
f->num_h_slices = 32;
f->num_v_slices = 32;
}
} else if (f->num_h_slices && f->num_v_slices <= 0) { } else if (f->num_h_slices && f->num_v_slices <= 0) {
f->num_v_slices = 1024 / f->num_h_slices; f->num_v_slices = 1024 / f->num_h_slices;
} else if (f->num_v_slices && f->num_h_slices <= 0) { } else if (f->num_v_slices && f->num_h_slices <= 0) {