From patchwork Sat Aug 26 18:21:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4853 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp1142810jao; Sat, 26 Aug 2017 11:22:49 -0700 (PDT) X-Received: by 10.223.186.132 with SMTP id p4mr1388116wrg.181.1503771769782; Sat, 26 Aug 2017 11:22:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503771769; cv=none; d=google.com; s=arc-20160816; b=anIR7hePJkIVRkmkWIzTj6MArXvddgpZbdHzmS1FeeKCgTW8VukbQaLueXmtLZKl1h 69xazly3foB8Jmg8g11zra78u4CNcVjx8YgqK8WRdAirNnRsatmDQEgwP2IvBmD5ZuuF WDPnpNQtkTyBGF8ZtiO2cFsiYXrI5IvGU+lDx/lhbgzXZYslcIutC757UXmqF3I+QXiX J9WobtQt8BB/SV/gl3ASyM0L2Z+Lbqfn9xKphqAqpbKAiHJV7mgZMDrYCq9RBafMCC5e vc49o92lHOapAVkvGGPgj8bhWMegzhlRLiy5vqB7GzC2GiRl//cHwnGU/er9EnwBj7SZ SrYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Qmex1LobbWRb9kQWah271VxQGvVW7eRMocItXimEj2A=; b=tZfDFbSS7+nnMr9nJuRhQuVDm0VurfAtNX0UFGfWFSzPLT14U70wkR2kRwCgdkJ89E BpvOJW4El5yqmMWW34XBomB8JPu0DEkqfNQyUp3pETJGXPKftZL0UV5/0M33oyzhpo3C MRhNsdTxINBU9C4xaIDKUHBEyrdExUb7y56fk8cU/QLfVou0rQUevumQuIYlOoanrzkK EON7u4IzKQeiALEk2UV4fnj3Sfl+Dy4U8rkoCTeXVqR1NTOn5lkv8zC6ptlvjcA99wcF iYNiHcVEaUHNYqdFuShpgZlOGQaJbplXXt2rVrtA5ZO4FJCz1PqHCODqRlVyfG84EzUv TQLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pTJULbgU; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o12si3383767wmi.112.2017.08.26.11.22.49; Sat, 26 Aug 2017 11:22:49 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=pTJULbgU; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 07D69689D6C; Sat, 26 Aug 2017 21:22:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C764689D45 for ; Sat, 26 Aug 2017 21:22:31 +0300 (EEST) Received: by mail-qt0-f194.google.com with SMTP id g13so2309074qta.4 for ; Sat, 26 Aug 2017 11:22:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=gT59SI65p6r1Nl6CoLWhyIDYhI5KQNkUKH6nd/umULA=; b=pTJULbgUEKIzfvt/iDmA3BrWpncq/b2N4RmJU1um8lslsKau3T/MuwZgukcxGt+e7Y G7bl35apJeUG0FWnzYEjOA5Wvzz/qFylJZGlYAAsrqRTX+mmyokd8e5tg/TWhczs+yJf JEdNu4CchD817ScbAhler3Uv7VnKkCnkKMNiXd5QNK8kyqYUdpw8hMDzGDCOwKoyJKv+ FlAsnEaCHYAvDBkn25MMo9XsUdqO1CiNWgpXucj/eCoFZ8BlWCuedmBEWfW3tFMN6mtr xzIRdCUV+vLy9qyKuLzWb+SRv40dStaYYGsPIR8UUkg+Bl6eS0NHryPpeQ1nX4aSAtl+ DmxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=gT59SI65p6r1Nl6CoLWhyIDYhI5KQNkUKH6nd/umULA=; b=YLqKv+3guBBQsVXgKRIPtwtBoOyLcgAWJr23JCNTv/kwz/Rxr2dgwEJ1lvTeXUDwnP 2me/tqJhmEotgO9lQdLOirV61OMksEqKS2+gKmo0etGZa+LsfhFJoL0GzZytMIDPN4Q5 UvVJdKq2QW4D6dCI02wA7AW2NssH1YuQtuHs8Z8/xBTa8l1c15tKW2oZu0W53DG4eJvc zxQaZJuxsgbZ7AHmoaOwA68QJz9BBOd2hKrqaIaSDW6kJc0Uo8B56Sm5HBtx4g8BKrUF 70hKfhMjO9FCO5RnwoDRn5ezHgO55KixjM0t3gz4jLW07JflGph54TwassSBu7ik0OEi F+BA== X-Gm-Message-State: AHYfb5gf0IFE3QjNvvRfsMwUa9/FjCFskcrE95KKOIWfGdUpBJOeC9MS XR6gdW60ccgEzSyK X-Received: by 10.200.25.102 with SMTP id g35mr1800446qtk.331.1503771758819; Sat, 26 Aug 2017 11:22:38 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id j62sm5934423qkc.28.2017.08.26.11.22.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 26 Aug 2017 11:22:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Aug 2017 15:21:43 -0300 Message-Id: <20170826182143.1152-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170826092343.GV7094@nb4> References: <20170826092343.GV7094@nb4> Subject: [FFmpeg-devel] [PATCH v3] avcodec/snowenc: fix setting motion_est 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Remove usage of FF_MPV_COMMON_OPTS, and set SnowContext.motion_est directly. Based on code from svq1enc.c Signed-off-by: James Almer --- libavcodec/snow.h | 3 ++- libavcodec/snowenc.c | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/snow.h b/libavcodec/snow.h index f7ed1f82e7..41a3bef4de 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -32,10 +32,11 @@ #include "rangecoder.h" #include "mathops.h" -#define FF_MPV_OFFSET(x) (offsetof(MpegEncContext, x) + offsetof(SnowContext, m)) #include "mpegvideo.h" #include "h264qpel.h" +#define FF_ME_ITER 3 + #define MID_STATE 128 #define MAX_PLANES 4 diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index ca55914d9e..75940437c1 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -33,8 +33,6 @@ #include "mpegvideo.h" #include "h263.h" -#define FF_ME_ITER 50 - static av_cold int encode_init(AVCodecContext *avctx) { SnowContext *s = avctx->priv_data; @@ -1685,6 +1683,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, s->m.unrestricted_mv= 1; s->m.lambda = s->lambda; + s->m.lmin = avctx->mb_lmin; + s->m.lmax = avctx->mb_lmax; s->m.qscale= (s->m.lambda*139 + FF_LAMBDA_SCALE*64) >> (FF_LAMBDA_SHIFT + 7); s->lambda2= s->m.lambda2= (s->m.lambda*s->m.lambda + FF_LAMBDA_SCALE/2) >> FF_LAMBDA_SHIFT; @@ -1919,8 +1919,11 @@ static av_cold int encode_end(AVCodecContext *avctx) #define OFFSET(x) offsetof(SnowContext, x) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { - FF_MPV_COMMON_OPTS - { "iter", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ITER }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, + {"motion_est", "motion estimation algorithm", OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_EPZS }, FF_ME_ZERO, FF_ME_ITER, VE, "motion_est" }, + { "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0, VE, "motion_est" }, + { "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, VE, "motion_est" }, + { "xone", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_XONE }, 0, 0, VE, "motion_est" }, + { "iter", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ITER }, 0, 0, VE, "motion_est" }, { "memc_only", "Only do ME/MC (I frames -> ref, P frame -> ME+MC).", OFFSET(memc_only), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "no_bitstream", "Skip final bitstream writeout.", OFFSET(no_bitstream), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "intra_penalty", "Penalty for intra blocks in block decission", OFFSET(intra_penalty), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },