On 03/03/17 10:18, James Zern wrote: > On Thu, Mar 2, 2017 at 11:00 AM, Kagami Hiiragi <kag...@genshiken.org> wrote: >> From ae3856c302284d60761c3ad122ff49b7b9b68114 Mon Sep 17 00:00:00 2001 >> From: Kagami Hiiragi <kag...@genshiken.org> >> Date: Thu, 2 Mar 2017 21:19:09 +0300 >> Subject: [PATCH] lavc/libvpxenc: add -row-mt option >> >> --- >> libavcodec/libvpxenc.c | 11 +++++++++++ >> 1 file changed, 11 insertions(+) >> >> [...] >> [VP9E_SET_TARGET_LEVEL] = "VP9E_SET_TARGET_LEVEL", >> [VP9E_GET_LEVEL] = "VP9E_GET_LEVEL", >> #endif >> +#if VPX_ENCODER_ABI_VERSION >= 13 > > Better to use #ifdef VPX_CTRL_VP9E_SET_ROW_MT. > >> [...] >> +#if VPX_ENCODER_ABI_VERSION >= 13 >> + {"row-mt", "Row based multi-threading", OFFSET(row_mt), >> AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, VE}, >> +#endif > > We could use -thread_type/-slices here, though this is in line with > vpxenc. I'll leave this open to comment.
Updated. I don't think -slices would fit logically because -row-mt is boolean and -slices is integer. --- libavcodec/libvpxenc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index de0d0b6bcb..7c567a0d1d 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -108,6 +108,7 @@ typedef struct VPxEncoderContext { int noise_sensitivity; int vpx_cs; float level; + int row_mt; } VPxContext; /** String mappings for enum vp8e_enc_control_id */ @@ -139,6 +140,9 @@ static const char *const ctlidstr[] = { [VP9E_SET_TARGET_LEVEL] = "VP9E_SET_TARGET_LEVEL", [VP9E_GET_LEVEL] = "VP9E_GET_LEVEL", #endif +#ifdef VPX_CTRL_VP9E_SET_ROW_MT + [VP9E_SET_ROW_MT] = "VP9E_SET_ROW_MT", +#endif #endif }; @@ -720,6 +724,10 @@ FF_ENABLE_DEPRECATION_WARNINGS #if VPX_ENCODER_ABI_VERSION >= 12 codecctl_int(avctx, VP9E_SET_TARGET_LEVEL, ctx->level < 0 ? 255 : lrint(ctx->level * 10)); #endif +#ifdef VPX_CTRL_VP9E_SET_ROW_MT + if (ctx->row_mt >= 0) + codecctl_int(avctx, VP9E_SET_ROW_MT, ctx->row_mt); +#endif } #endif @@ -1132,6 +1140,9 @@ static const AVOption vp9_options[] = { #if VPX_ENCODER_ABI_VERSION >= 12 {"level", "Specify level", OFFSET(level), AV_OPT_TYPE_FLOAT, {.dbl=-1}, -1, 6.2, VE}, #endif +#ifdef VPX_CTRL_VP9E_SET_ROW_MT + {"row-mt", "Row based multi-threading", OFFSET(row_mt), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, +#endif LEGACY_OPTIONS { NULL } }; -- 2.11.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel