From patchwork Fri Mar 3 10:20:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kagami Hiiragi X-Patchwork-Id: 2745 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.31.14 with SMTP id f14csp179515vsf; Fri, 3 Mar 2017 02:21:05 -0800 (PST) X-Received: by 10.28.169.199 with SMTP id s190mr2266072wme.2.1488536465002; Fri, 03 Mar 2017 02:21:05 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o67si2304709wme.150.2017.03.03.02.20.38; Fri, 03 Mar 2017 02:21:04 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@genshiken-org.20150623.gappssmtp.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3282B68075E; Fri, 3 Mar 2017 12:20:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f67.google.com (mail-lf0-f67.google.com [209.85.215.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 813AB6802AC for ; Fri, 3 Mar 2017 12:20:17 +0200 (EET) Received: by mail-lf0-f67.google.com with SMTP id r36so7702008lfi.0 for ; Fri, 03 Mar 2017 02:20:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=genshiken-org.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:mime-version:in-reply-to :content-transfer-encoding; bh=7QSaRgMxTEAlG7bV+vDsAqkiBqRexB5NJ76L+hI6Ojk=; b=d7E1S9h+kKC2DyiVusibRhM5s7JIEPSxaaoPDtZSfcm3VnVV6fqa3Gs7aTcH1tY4Cb xJbwatJXVRcvO3CL+6mS6P22hdEmXfplCpMpq3N6q4M3+ypgG58YQelQm7lg2Dx4C5OH CAWvQRnhlHn5MbT3fH2LgmYXsIsl+1w9Q6SpFycmgys4xutxUgoJUZiWqXGOcnhORMwg P44Rel/MXg00LIFznHnbqNMT38Y8pBPryUYhYDm5L/TzfKJckFWJpp4q2PlKZJIYANv0 wKlHZdnUzZa8lYIORGRFmyZ0MM+0zM2s/kHuVlGILiYdmk7c6yrMzKeRMaPppx54FwAF XDSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :mime-version:in-reply-to:content-transfer-encoding; bh=7QSaRgMxTEAlG7bV+vDsAqkiBqRexB5NJ76L+hI6Ojk=; b=q5toFh/qhV8EfAlzdAhva5610HQ4uEhC+gUpL0P2UZQOOpzfOo9Qx8tyTvBXYUq4kf Olk8Deqgps8EvoiZzeCUnlhaCxvdCE3r972hA+ijm+3+OYBvgDzKeMbjEAfw3dR+iqYl 3Vz5C4bRWfdUoQuS+KXjPnn7BBofy28hxXSFf5MITrwtVmiNyquSYN3WS26UsVEbK05X EFC2TdHs3EvCkFG/scrVILknGuBuNJRMpdsn8fWdm8FtxR+DBep6Tkx6k8U8vqjjNHiU cICTvjmknXW/eHBRpKmi7MTq7hXyi1qgaxoB5DQZbtR8hcGpeSJORN44F5cPtrW5tRHi CDCw== X-Gm-Message-State: AMke39meca/lSFKialQqtf+UDa/4lct+F1vxNMqNlgbTdyuVjqQswjOs35lNW09vmWtRwg== X-Received: by 10.25.233.21 with SMTP id g21mr684300lfh.130.1488536428218; Fri, 03 Mar 2017 02:20:28 -0800 (PST) Received: from [172.17.0.4] ([185.61.149.148]) by smtp.googlemail.com with ESMTPSA id c28sm2238234lfh.49.2017.03.03.02.20.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Mar 2017 02:20:27 -0800 (PST) To: FFmpeg development discussions and patches References: <66bb75d0-c6e9-aa22-bdda-a83ca09dbc9b@genshiken.org> From: Kagami Hiiragi Message-ID: <920806d7-34c8-d3ad-df47-b1be5779481d@genshiken.org> Date: Fri, 3 Mar 2017 13:20:26 +0300 MIME-Version: 1.0 In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH] lavc/libvpxenc: add -row-mt option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On 03/03/17 10:18, James Zern wrote: > On Thu, Mar 2, 2017 at 11:00 AM, Kagami Hiiragi wrote: >> From ae3856c302284d60761c3ad122ff49b7b9b68114 Mon Sep 17 00:00:00 2001 >> From: Kagami Hiiragi >> 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 } };