From patchwork Sun Aug 27 01:53:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4854 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp1310858jao; Sat, 26 Aug 2017 18:53:34 -0700 (PDT) X-Received: by 10.28.173.15 with SMTP id w15mr1647626wme.113.1503798813997; Sat, 26 Aug 2017 18:53:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503798813; cv=none; d=google.com; s=arc-20160816; b=RFLpNw8kx0dhwTdANvchPPIrbybzoq2rFFDbETa1NMlbctY+Fi8Fo4Q8m0lhoDWkVZ ITjGJ5d9sBndzroz9k9V4CF/Vk/jgoINKdPhxvY+d3KNoRqUauT0UBTABvWzEI92UuIZ SMjQxcGobka7HPx/EXlp0gX7vKHGlexs+TH3DCaiqAXDZgOKh9/RbQZbonZTKPtPXamh RLpxlnqgT1QVFGhNOo6B2SuukFsmUUSqEeJMazzJw4huU+BJfe2kXlJ6j/sQEvTBZ0J4 nsHv7qnVyhpkCn2RkSK/5TbmotCS/XBJI7BJSbb37lpPdHifQvWzoWecg8g2Q6NvhFxV +daw== 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=SG4TzsvLJWCH8SpsSfEY02b3w6+kExKFbu2rkkNgh04=; b=fg5BW3J7IjysOSW1IAwfdTrP84o23vGItcnDwdPTElau4HjMY9cqlxvlbYqE4ky61l TlzzIm2EQ4DUDSRZja70GCc+/sIlLH2CGvjywBwRdhhpd0+2BnsPGNciHKhGPuC7jRXg R6nYlX0LNN3sqUXSqKPrxDAF0y8AyUAS4hjAnDD67VLmihk24KRhReO/eAbhBbceiBUo RD2lqjB8YzdCoHCN5WP4rD7t4Ny20dfMEVZTnhQpWUa8exUHFOgy4DlEBC7E8MqLFKf3 SI8MMmAmGYvZT+xRe08ysUs0/lnfXQXCvLluuAwI7tefc64g4OjbSom5Gucd9xDIcdDo ixpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=g76WWCji; 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 o2si7999588wro.442.2017.08.26.18.53.33; Sat, 26 Aug 2017 18:53:33 -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=g76WWCji; 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 EAA01689D0E; Sun, 27 Aug 2017 04:53:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14CCF689AC3 for ; Sun, 27 Aug 2017 04:53:14 +0300 (EEST) Received: by mail-qt0-f196.google.com with SMTP id x36so2788186qtx.1 for ; Sat, 26 Aug 2017 18:53:23 -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=VHUEH8b6uuyOEvR141Q7j6FnMlZj0+iJwvNKir4wT6U=; b=g76WWCjiIUYeD5HSwPhuezwzgVCltdyty30pP8nZiS538x2QH05EWPlpySKlM+f5KD sX+cclyuU9Y+7Qr70uWqNMBBgQaJrP4/y62uy5AXq3sQz/Jjf7UFNDKWBBBi10qycWVp +gjyLRY5ijb7THFlPyYVqcMHgQ7BJmpqC1ur55YnbaZV6r6BIG88vqJewVhn2SxtcgZB lbLwDVGiwA7jF0ry9ECR9zHsNV0hGI+UiUFNsqAuU3vut8l9pX5tYd2moAKbgo56I+0K K3aiSTVoYfDjhiokaw2f9svTbiN23X36czICiAQ5xdv7OH3Zv1kbvMbYnQuHPJ0nqI62 O4dA== 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=VHUEH8b6uuyOEvR141Q7j6FnMlZj0+iJwvNKir4wT6U=; b=KBAYvAowhlMDMYIvt20da5DvW2cMqJgG4f1VHPt100mQfLfC5OqjnHECmJ3iYNzqVj ewJYsmdwNcnQCuR5fnNSQegOrNsyUkEEeI/lO/yn0QheqX+AsS1oRpUDjxMfgemeGexC pjShXa+LHX4KeN9sEevYAWIKk56vGeenBA3rQDzOWgbxNkbGcQEc5mgfz4W3TOv+JjX2 mhDr0IUOK+cHHx83gHz8nJi/q0BOw9Mi2s1vj6jC52Rerhh5qL4gmsbrQasf1wncqGQf w0UlVMMDCANjBLVkGGChHfN2Z0fyD9NiV8heUSLSC8EBqWVvUPB0PJAzd9XDtk7+YxD6 /Qjg== X-Gm-Message-State: AHYfb5j7gb0ms7dZr0WZA1Y9JhJUkVqYg3rgxp8qJowkmjOrwyqwrC+B D//QElBVSdilmpi3 X-Received: by 10.237.32.68 with SMTP id 62mr4345848qta.164.1503798802021; Sat, 26 Aug 2017 18:53:22 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id d50sm6766369qtd.37.2017.08.26.18.53.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 26 Aug 2017 18:53:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 26 Aug 2017 22:53:10 -0300 Message-Id: <20170827015310.2812-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170827012825.GB7094@nb4> References: <20170827012825.GB7094@nb4> Subject: [FFmpeg-devel] [PATCH v4] 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 e03877a96c..bb113d0a2b 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; @@ -86,6 +84,8 @@ FF_ENABLE_DEPRECATION_WARNINGS s->m.avctx = avctx; s->m.bit_rate= avctx->bit_rate; + s->m.lmin = avctx->mb_lmin; + s->m.lmax = avctx->mb_lmax; s->m.me.temp = s->m.me.scratchpad= av_mallocz_array((avctx->width+64), 2*16*2*sizeof(uint8_t)); @@ -1929,8 +1929,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 },