From patchwork Thu Oct 20 15:31:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kagami Hiiragi X-Patchwork-Id: 1088 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp697062vsd; Thu, 20 Oct 2016 08:46:23 -0700 (PDT) X-Received: by 10.194.97.69 with SMTP id dy5mr760311wjb.53.1476978383386; Thu, 20 Oct 2016 08:46:23 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id rj13si62179405wjb.152.2016.10.20.08.46.22; Thu, 20 Oct 2016 08:46:23 -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=@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 75954689C0B; Thu, 20 Oct 2016 18:46:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01E7A689B74 for ; Thu, 20 Oct 2016 18:46:09 +0300 (EEST) Received: by mail-lf0-f68.google.com with SMTP id b75so918298lfg.3 for ; Thu, 20 Oct 2016 08:46:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=genshiken-org.20150623.gappssmtp.com; s=20150623; h=from:to:subject:message-id:date:mime-version :content-transfer-encoding; bh=EkmoubzgHophwlyku7PX71fGTjrcWY/ne3Nfx8havL8=; b=phfWCiogCbYzbtCGrkK4juAn5grbBt+llMIVPhd9VC6y1IUNIwuEdl0iTi3InohD0J HIyhbJBrpYcpLC3fiqNvoOGx/pPNCPr0NaGlckFbmDQ9WNd5BTlFQK155ayTcc7TS+L8 SGDuUfV59p2bDqA1tl62YXCI39CEuQ3qL5Mc/ICGDZlYIB4oUBikWKLEzbYzSRQsn6kk 4dVHaiXmPuJ5yzpv+fN4CZJBIAn1y2j8WZhzic+EGX0kNzS0kwZANB1D3oq3udmIyXVi PIBIewL328y8K8iWfTox89TM/5PzBKq/8HkmFnrAsF6OPh5ct4ZZCNh/wMMaV8tuB4Wp JwXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:mime-version :content-transfer-encoding; bh=EkmoubzgHophwlyku7PX71fGTjrcWY/ne3Nfx8havL8=; b=lXkN0uYIaCg+GHlTjwC+N69iekywFrtRUEH1FM+66NOwEXyMUBQ5Ffa1PjC4uZRLFH TCG4vMOOFHn6+nOuYIuf9pVo0UR9iqKKMqF2k7xLhv6FeNtIoorloxlTcTKebcPSyXFU 3Nb4siA1GPs7ySY/rJrgMpe+X0Fimv1TUkRVJGc5vAElLOT2QUZI2fPJWY747qoJptya e8MX8RSQe6Uj/xZNn7xX3eK7sbnJaSnBAy+/3leDMRImMeZaKvQT81/qLPtnZ04/xXMt 8zsHPFZOxdsndulHBASsXb5RKbvJ5Z98WoDOiiPYFPoX7fem1cKSKdXD0wi3KgEYWgbv vRDw== X-Gm-Message-State: AA6/9RmK9xub9W9VZR61j+TOERvE5PZOOtJD6sd9eQZRYPzqJNYqpEwUFiija8KiohEzng== X-Received: by 10.25.32.67 with SMTP id g64mr309965lfg.180.1476977499687; Thu, 20 Oct 2016 08:31:39 -0700 (PDT) Received: from [172.17.0.2] ([185.61.149.148]) by smtp.googlemail.com with ESMTPSA id 86sm12410851ljb.23.2016.10.20.08.31.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Oct 2016 08:31:39 -0700 (PDT) From: Kagami Hiiragi To: ffmpeg-devel@ffmpeg.org Message-ID: <6a0e1b12-2267-fd50-db03-d3be3db0a5a8@genshiken.org> Date: Thu, 20 Oct 2016 18:31:38 +0300 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/libvpxenc: fix -auto-alt-ref option type 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" vp9_cx_iface actually allows values in range [0..2]. This fixes ticket #5894. Signed-off-by: Kagami Hiiragi --- libavcodec/libvpxenc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 2db87f7..bedaa70 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -615,6 +615,11 @@ FF_ENABLE_DEPRECATION_WARNINGS } } + if (ctx->auto_alt_ref > 1 && avctx->codec_id == AV_CODEC_ID_VP8) { + av_log(avctx, AV_LOG_ERROR, "auto_alt_ref > 1 is forbidden for libvpx-vp8\n"); + return AVERROR(EINVAL); + } + //codec control failures are currently treated only as warnings av_log(avctx, AV_LOG_DEBUG, "vpx_codec_control\n"); codecctl_int(avctx, VP8E_SET_CPUUSED, ctx->cpu_used); @@ -1025,7 +1030,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, #define COMMON_OPTIONS \ { "auto-alt-ref", "Enable use of alternate reference " \ - "frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, \ + "frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, VE}, \ { "lag-in-frames", "Number of frames to look ahead for " \ "alternate reference frame selection", OFFSET(lag_in_frames), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, VE}, \ { "arnr-maxframes", "altref noise reduction max frame count", OFFSET(arnr_max_frames), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, VE}, \