From patchwork Sat Aug 26 00:07:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4845 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp706804jao; Fri, 25 Aug 2017 17:08:18 -0700 (PDT) X-Received: by 10.223.134.189 with SMTP id 58mr84826wrx.157.1503706098521; Fri, 25 Aug 2017 17:08:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503706098; cv=none; d=google.com; s=arc-20160816; b=N4BOdYJ+cS7KIFBBGxNzoRqZKFB0VGZfX983Kj1UEHBq2hiQcCE8gYq1KpIWV06DWI FEuxI3A8BpnnL0uPDD81cvz/q4PGEEcZA6T3O9FnOqdCsqU4RZ0IivrOHnkOCxvUtJLF 1MWK6NgsNjJm9kBIjAxD86aFLW705srCYGpf8zrc9zh/cPUjSn6Tgz+fSMpJd7wh5DeD +uXZJ1CWhY4dp3dhLqyy5YIt3KwXTKxTOx2TNYTXmdfcrdsvzMxzxV0x0YksJqIBT4aX uDUjGxnYwXqEn/1quXNg4EQEglVnj0joyOj76MsL23ofgym6CmSHOH+HlG8FERtQW14x /F7g== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=IqPyzL2LOmA26A1qUbHQPhLGwBAeKW3I91eJXCvQgWg=; b=xGlcqoz+nZtLWPHrpHIaKrRtGfmMKoMHbXl5QKBsk1ERARf/23/ria9I24Mfp2R5nF pdOXH9DclaUfaFDKWrRpjAFcLDNyDgRzQSTJwpPDlMcwCKYr7uqAllCTNOA98bxGbgW3 G+NfFv3ihc0/BC4jdNSzXgTxljGbNq1KO8mBp1g2z9X/s6MNF9vVhBrRx2ubxj+6En5V f95WPUshmLfDeIh2TaEAfrlpeMsKqIsnbic3jbJIcU6Z0bL0aEsjx3E+eCYsovM8W4jG CiE/bOWmPyOpeId69fRkGC4Nyv1xcHKXMejFJC0IQho52sESfokueApzmC5SggapBU5/ ElNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NsGQ5h1f; 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 i26si2019854wmb.34.2017.08.25.17.08.18; Fri, 25 Aug 2017 17:08: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=NsGQ5h1f; 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 DAF9D689ACB; Sat, 26 Aug 2017 03:08:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7D81689A7A for ; Sat, 26 Aug 2017 03:07:59 +0300 (EEST) Received: by mail-qk0-f195.google.com with SMTP id o65so1163867qkl.2 for ; Fri, 25 Aug 2017 17:08: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; bh=x7gplww1X/7KbxRmSfcdEJoSRtz81s/0yktvEFcJcdI=; b=NsGQ5h1fISrHe5eUt9nilm8ST/H6C38e8CmvgA5rVyAsvXNA9pw2DAUtvDyY2kFRYO uUr3O6TsCYQ7EuYBsZD3bR/sPfFuiedn9IbwMv2n368wPoTpsp+iu5pMWkFb2dAXXW1n 7vomRxe6xHUYDYBYojSNRbIQr1TEyWCdazBxHOVInFmuRGj6LNXk15XjomqtJt8LDAIy ewnfyIuUrzMVgS8MxZCb893NTD6qKhlHnxOMu1FHtCZQMJiZjgKuiriCmNFT8J618Vg5 gaOv62Xk3nZvPZ1ExGLzDoLrXTVbHj06yyrofuNRV29UWZG9MmIEmPL5xhNoO6i8OxJv 0fUA== 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; bh=x7gplww1X/7KbxRmSfcdEJoSRtz81s/0yktvEFcJcdI=; b=sU0nfCQm3pwRc0HiwFvzSf6mK2zTWWiCO+fQi1GP0gOFbI9Dv27ou8OQXCDRiaWunD 4TQgevRpysbz8yNhtrLNvfcQRoXySklpLIP1czC9O8E0JkWgU0bebvWqfF8L1aLTnl7Q 1D6nQW/NyRP48/iGc1g+O10V5r0yUVdQEcr/Brrsec8FFdPj2RIlU16Z+yQYNwpiYFQ/ LDGwwk+/ek/Wsogs0ld/wiOkfuoHIu99YutQ226bxb4xnghWBMNSEl8S97nigPqpy1tP Xj5V1M0nZTRT8FyGM/G0Zqc4ejkkbBlA5jD3Xbsfiw1djGrQnQMOwWRjevWLleNGLEu7 CtwA== X-Gm-Message-State: AHYfb5gWwGW5dBKajMqOCilWIip0xbN5UcjhkMPlWBtc3k042YfsswlQ HpLZNmPsFOJBO/FU X-Received: by 10.55.179.129 with SMTP id c123mr259077qkf.176.1503706087366; Fri, 25 Aug 2017 17:08:07 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id z189sm4795740qkc.39.2017.08.25.17.08.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Aug 2017 17:08:07 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 25 Aug 2017 21:07:53 -0300 Message-Id: <20170826000753.4060-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.3 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 | 9 +++++---- 2 files changed, 7 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..1cd7915cc3 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; @@ -1919,8 +1917,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 },