From patchwork Sat Aug 26 14:37: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: 4851 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp1039928jao; Sat, 26 Aug 2017 07:38:18 -0700 (PDT) X-Received: by 10.28.26.136 with SMTP id a130mr709559wma.60.1503758298834; Sat, 26 Aug 2017 07:38:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503758298; cv=none; d=google.com; s=arc-20160816; b=twN+RjfWphb2LIRi8pOAHHojMdvIeR6Sekis4JlwHG5D08FOSR+55KE6PQBvmnUpF7 JZb3Z3qamrNX8v+BiRaCMfNoynhjSiIGcrpOc5u+D2tcmCBXxm+sWhENkVIkZbmr8Cap gQlAYhuMiynvT1xOmdSHUKsP3T2z+fq3xkIL+L9GpAhzNQL5mgpKLx+zqJZrFZHlfk7p m5Fcr8od5R2mlKf+qBOd1FokeW+Tsp4u85P2hYQOWgP/fqfJJqLeWVn9lBiZnYGp3lQX VqLx1BcAE1KWUIevWk8dZxoN35w419DF9ho9Nrcj0B0SOhuS4LQlOkSIcIOZRMLeydWV 3ACg== 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=ZS2OiK7S8rE58UbmOKTJAkQRuG4INuoRGNurcrU5v0U=; b=HpXwSWhG6OreZwBMiFTr1hg207oastZTRnG9WmSLs1QpSm3rpriwHpriN0HbkRS3K9 FZnz8B4pq4SdB7nJoRuASQjRAKKRfffjEVAoDtXZx2qWdrCNtRN3A0wyNXNfr8Yc93Wh NU0qXFw5gyj8fczTXpSMCfwYXzP5ipxhLCX0kULkEP1lPyJkdCkS2Im3tilzYHUJZiKc vpbcqlvGCHgWbECMX/oqo8rWt3caIRSdTiwmdCsWaLr7DB6yQdW9dsIV1ZOuPW9XEJ/Z mRZZT6LLeQGsHY7wSG/Vj8jx41oIMQGD9iAOSmnG3Vt1NXHF0cJ7i2zWr7mh3ZUlssM8 KpmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=uryNcadH; 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 g130si3132230wme.33.2017.08.26.07.38.18; Sat, 26 Aug 2017 07:38:18 -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=uryNcadH; 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 18694689BDE; Sat, 26 Aug 2017 17:38:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 58C8B689B3A for ; Sat, 26 Aug 2017 17:37:59 +0300 (EEST) Received: by mail-qk0-f196.google.com with SMTP id o65so2082577qkl.2 for ; Sat, 26 Aug 2017 07:38:08 -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=eCwFK2B1ntF5/IxG5SDJMGZMMAqQuhX9IHjW9ZUclUU=; b=uryNcadHI1OnLt3yDhr1+7zktIKxkAXea7IBQhqVuTnuG+zMq0IliV6ReHZjUJPZz0 rF0jX3WsBT9pSDa1WvCGUu3aFEBPkw3hZ1wVV4r0RygGGGd6HwPP4ykcxU+7rE9D2Btr 9LX8xj2/ULWfUXv72MbYWxCASmYGYdhsQz2Q5RPc9obvR78W7ETldrFlzWMUbT7epuM0 7e406W047qaTBUBbQ1c8oYR5mRX6wXwVuTTzgP8dD+zg+w/ONlTVIvAMOuMaXJaaIAeD nLkVxV54BZEpvEYnmfxTaHzAQjyH+dLg6u96QYgnIv0GTO1Vf6AD8M9/SSvYQ4y+SFzf jT2Q== 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=eCwFK2B1ntF5/IxG5SDJMGZMMAqQuhX9IHjW9ZUclUU=; b=FIShY8ltzpuZVvHrKBd86dAhzxXoqzCCWVkUPDPYLZmHW3oCbggmzbRXCYzWBfgeFT T7+SE2VvOY0o73ocm68rzi+5fQ0TNZeNDNg8Aes632XO1SvrBYIjq4QsUbZt5qh4Rcio x6GRFIsKNnMYxgunW0Xv3G9rus8RGlRg7Pw7lk2b7DY0RFHsepux4oNAjExEahdtAtTa TxELjrynUfAe1mCALZC0H6i3IlqYvCAoLWcKA4tTQ3ZQd3yTWX+I7tKmRocwjehkIlff eMWNHSM8blKTQ+8FlRSezNGaGes4C3y+vqizFzn3ikCjZIHSIl5KkrWcC5VjXrLysdep dwyw== X-Gm-Message-State: AHYfb5hSEXoKKynPeW4GgXj93yCIQzMQhZl5qN5oeWyWwyApqrPaHhOb wdpzjShsaMbzF4fQ X-Received: by 10.55.16.42 with SMTP id a42mr2521781qkh.124.1503758287053; Sat, 26 Aug 2017 07:38:07 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id t125sm5686958qkf.46.2017.08.26.07.38.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 26 Aug 2017 07:38:06 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Aug 2017 11:37:43 -0300 Message-Id: <20170826143743.3564-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] 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..c31886a812 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 = 2*FF_QP2LAMBDA; + s->m.lmax = 31*FF_QP2LAMBDA; 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 },