From patchwork Mon Mar 6 22:20:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 2773 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp293140vsy; Mon, 6 Mar 2017 14:20:43 -0800 (PST) X-Received: by 10.28.92.212 with SMTP id q203mr14841870wmb.73.1488838843263; Mon, 06 Mar 2017 14:20:43 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r186si16246026wmd.5.2017.03.06.14.20.42; Mon, 06 Mar 2017 14:20:43 -0800 (PST) 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; 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 5C335687EC7; Tue, 7 Mar 2017 00:20:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f41.google.com (mail-lf0-f41.google.com [209.85.215.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 800BE680782 for ; Tue, 7 Mar 2017 00:20:12 +0200 (EET) Received: by mail-lf0-f41.google.com with SMTP id y193so79019280lfd.3 for ; Mon, 06 Mar 2017 14:20:25 -0800 (PST) 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=iBnxqaCNpocfUUCaSqPDGwDErpP+YPxdM2Wc503wF/0=; b=e3Y8OggmtG/d10epvjX4RUvUAqMJ+ycpUEU+BJowvU98KtmCDd8pn72qxrxj96Z/KR 0QPrEmyFD64pi9a+w5vwkHrGYj+AHIG9FOEUlAkwCDZJh71Na11cejOqY8AWLQa9LhCm SCjcjjd0qpKsg41aR/HfC6FbsQMzB1yWqdhVpO404wDqOO6mB531l001vAVN7yoMUpXK BnG6VrZkJ68I2M5GuaN1J5yUZE/SwrlOrHXTouF/+UeIn/qq4Y1iJxcqJSriTJVfEnA/ KHEpLUFqdcQxxiJTD5sacUX0vqV5SXVyZXVHokoSBqRGFLs+TsVdngW19+vcqXZHHOG+ G3Jw== 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=iBnxqaCNpocfUUCaSqPDGwDErpP+YPxdM2Wc503wF/0=; b=EcTbf8/42PqcHiWkn5Wm3MY9Iej1OpK4FSmLZQjzAhT8VwHYkl2nXLJnbxZmVtFXUO /Sg4XevzMuVtjra8vd5xaA2/Ulz2vUaAss1p6EGunl+gX+9URvJj1BwFewUvS3hjk/dn bsHwMGdkAanYmMqHBrCGjcuxhasbOs1Q4lYmi8oJV0mOD0PHAeVmJMd7FZ5oKS19B3pd b/211HJQnH4dAWZ4poeYbEy+svL8HeiEcRq+DF09sLy6nbCO5ZGCWfYKxDZZjhmHzl6X 8BBarv4fhCPnBMBH6l3QB+CCjx46qAsSZxmuZZb0D8JpLkxXwesf1HzWenHRUp05F45r ywZA== X-Gm-Message-State: AMke39ky2Y5q2BMsczrhVKJsEY09YACD/itS+zRZamQyGL7XMGXf1piia97HYKqdySuF+w== X-Received: by 10.25.158.130 with SMTP id h124mr5558810lfe.172.1488838824686; Mon, 06 Mar 2017 14:20:24 -0800 (PST) Received: from localhost.localdomain (a88-114-245-102.elisa-laajakaista.fi. [88.114.245.102]) by smtp.gmail.com with ESMTPSA id e102sm1729749lfi.0.2017.03.06.14.20.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Mar 2017 14:20:24 -0800 (PST) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Mar 2017 00:20:20 +0200 Message-Id: <20170306222021.17917-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170306222021.17917-1-jeebjp@gmail.com> References: <20170306222021.17917-1-jeebjp@gmail.com> Subject: [FFmpeg-devel] [PATCH 1/2] libx264: remove the "x264opts" AVOption 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" x264-params does the same thing and this leaves us with a single option that is name-matched with x265-params available in the libx265 wrapper. --- libavcodec/libx264.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index b11ede6..5cbc376 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -53,7 +53,6 @@ typedef struct X264Context { char *level; int fastfirstpass; char *wpredp; - char *x264opts; float crf; float crf_max; int cqp; @@ -396,20 +395,6 @@ static av_cold int X264_close(AVCodecContext *avctx) return 0; } -#define OPT_STR(opt, param) \ - do { \ - int ret; \ - if ((ret = x264_param_parse(&x4->params, opt, param)) < 0) { \ - if(ret == X264_PARAM_BAD_NAME) \ - av_log(avctx, AV_LOG_ERROR, \ - "bad option '%s': '%s'\n", opt, param); \ - else \ - av_log(avctx, AV_LOG_ERROR, \ - "bad value for '%s': '%s'\n", opt, param); \ - return -1; \ - } \ - } while (0) - static int convert_pix_fmt(enum AVPixelFormat pix_fmt) { switch (pix_fmt) { @@ -774,19 +759,6 @@ FF_ENABLE_DEPRECATION_WARNINGS if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) x4->params.b_repeat_headers = 0; - if(x4->x264opts){ - const char *p= x4->x264opts; - while(p){ - char param[4096]={0}, val[4096]={0}; - if(sscanf(p, "%4095[^:=]=%4095[^:]", param, val) == 1){ - OPT_STR(param, "1"); - }else - OPT_STR(param, val); - p= strchr(p, ':'); - p+=!!p; - } - } - if (x4->x264_params) { AVDictionary *dict = NULL; AVDictionaryEntry *en = NULL; @@ -908,7 +880,6 @@ static const AVOption options[] = { {"passlogfile", "Filename for 2 pass stats", OFFSET(stats), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE}, {"wpredp", "Weighted prediction for P-frames", OFFSET(wpredp), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE}, {"a53cc", "Use A53 Closed Captions (if available)", OFFSET(a53_cc), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, VE}, - {"x264opts", "x264 options", OFFSET(x264opts), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE}, { "crf", "Select the quality for constant quality mode", OFFSET(crf), AV_OPT_TYPE_FLOAT, {.dbl = -1 }, -1, FLT_MAX, VE }, { "crf_max", "In CRF mode, prevents VBV from lowering quality beyond this point.",OFFSET(crf_max), AV_OPT_TYPE_FLOAT, {.dbl = -1 }, -1, FLT_MAX, VE }, { "qp", "Constant quantization parameter rate control method",OFFSET(cqp), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE },