avcodec/ffv1enc: Consider 2s x s slice configurations

Michael Niedermayer committed 1 year ago

Commit 37a319f1 parent 2d9c9da1 file · +1 −1Browse files

Unified · Split

libavcodec/ffv1enc.c+1−1

@@ -570,7 +570,7 @@ int ff_ffv1_encode_determine_slices(AVCodecContext *avctx) · 569 unmodified lines
570	s->num_v_slices = (avctx->width > 352 \|\| avctx->height > 288 \|\| !avctx->slices) ? 2 : 1;	570	s->num_v_slices = (avctx->width > 352 \|\| avctx->height > 288 \|\| !avctx->slices) ? 2 : 1;
571	s->num_v_slices = FFMIN(s->num_v_slices, max_v_slices);	571	s->num_v_slices = FFMIN(s->num_v_slices, max_v_slices);
572	for (; s->num_v_slices < 32; s->num_v_slices++) {	572	for (; s->num_v_slices < 32; s->num_v_slices++) {
573	for (s->num_h_slices = s->num_v_slices; s->num_h_slices < 2*s->num_v_slices; s->num_h_slices++) {	573	for (s->num_h_slices = s->num_v_slices; s->num_h_slices <= 2*s->num_v_slices; s->num_h_slices++) {
574	int maxw = (avctx->width + s->num_h_slices - 1) / s->num_h_slices;	574	int maxw = (avctx->width + s->num_h_slices - 1) / s->num_h_slices;
575	int maxh = (avctx->height + s->num_v_slices - 1) / s->num_v_slices;	575	int maxh = (avctx->height + s->num_v_slices - 1) / s->num_v_slices;
576	if (s->num_h_slices > max_h_slices \|\| s->num_v_slices > max_v_slices)	576	if (s->num_h_slices > max_h_slices \|\| s->num_v_slices > max_v_slices)