From patchwork Mon Dec 30 05:01:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 17051 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2E84B44AB62 for ; Mon, 30 Dec 2019 07:02:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 14E576899EA; Mon, 30 Dec 2019 07:02:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (smtpbg472.qq.com [59.36.132.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B7C96807F6 for ; Mon, 30 Dec 2019 07:02:20 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1577682104; bh=DyE8BaYskDSIB9PF5ReCstLLMwgm8WaSAyqH69VsBh4=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=muq/3l7sDjReOtNWhFQP/mMX6ovSMX1x/uZvR+QWkG4RW5FENU7qgRocv8rDjn1yO ddu2KPxFUGc4zdC7ZdxcnHva9066m87tYBKSqv7iSqoQFzYbk+atpkn3+cy9FgfYTt vYRFnzJlWPqQiaotmR1fbdfNxSJIdZAtlY2Hi/ik= X-QQ-mid: esmtp7t1577682102tbc21fg17 Received: from ZHILIZHAO-MB1.tencent.com (unknown [14.17.22.54]) by esmtp4.qq.com (ESMTP) with id ; Mon, 30 Dec 2019 13:01:41 +0800 (CST) X-QQ-SSF: 01000000000000N0WG4000000000002 X-QQ-FEAT: BMR7gkUTufgGBSyGMjnTAVnH/3ALXHvqWbBPeXbBSvgcJXVPTcgo1sQTc2cxr +d5IaXeTzPdCBzVsnKzTSRJ9g1P8APFz8NHja2BRR7RQdmWleezDKFmNEifc5EGF9j3CT0m RHveFwYoM2OBLuaY5pbW6X46+BlI6dgP1dx/nWpwgumz5voUZ7DrFvgR/7jFSXdId/XQNpC FBiuJd+qcc3oR0RC+0sP8UskW4YZ4PcslOEDTaI5qX7R7sRICo9nIMpE4CyRsgBlLyLVLvc o0horZaOk/iJVa6cA1P4li7xM= X-QQ-GoodBg: 0 From: quinkblack@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Dec 2019 13:01:38 +0800 Message-Id: <20191230050138.21578-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20191228144203.2r7p7ywgfyzevknw@phare.normalesup.org> References: <20191228144203.2r7p7ywgfyzevknw@phare.normalesup.org> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:foxmail.com:bgforeign:bgforeign11 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v5] avfilter/buffersrc: deprecate sws_param 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Zhao Zhili --- Rebase patch on master. doc/filters.texi | 8 ++++---- libavfilter/buffersrc.c | 14 ++++++++++++-- libavfilter/version.h | 5 ++++- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 619542e7b5..341503c7f8 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -21209,9 +21209,9 @@ Specify the frame rate expected for the video stream. The sample (pixel) aspect ratio of the input video. @item sws_param -Specify the optional parameters to be used for the scale filter which -is automatically inserted when an input change is detected in the -input size or format. +This option is deprecated and ignored. Prepend @code{sws_flags=@var{flags};} +to the filtergraph description to specify swscale flags for automatically +inserted scalers. See @ref{Filtergraph syntax}. @item hw_frames_ctx When using a hardware pixel format, this should be a reference to an @@ -21236,7 +21236,7 @@ buffer=size=320x240:pixfmt=6:time_base=1/24:pixel_aspect=1/1 Alternatively, the options can be specified as a flat string, but this syntax is deprecated: -@var{width}:@var{height}:@var{pix_fmt}:@var{time_base.num}:@var{time_base.den}:@var{pixel_aspect.num}:@var{pixel_aspect.den}[:@var{sws_param}] +@var{width}:@var{height}:@var{pix_fmt}:@var{time_base.num}:@var{time_base.den}:@var{pixel_aspect.num}:@var{pixel_aspect.den} @section cellauto diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 2fa9e00daf..64940d91e2 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -51,7 +51,9 @@ typedef struct BufferSourceContext { int w, h; enum AVPixelFormat pix_fmt; AVRational pixel_aspect; +#if FF_API_SWS_PARAM_OPTION char *sws_param; +#endif AVBufferRef *hw_frames_ctx; @@ -271,10 +273,16 @@ static av_cold int init_video(AVFilterContext *ctx) return AVERROR(EINVAL); } - av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d pixfmt:%s tb:%d/%d fr:%d/%d sar:%d/%d sws_param:%s\n", + av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d pixfmt:%s tb:%d/%d fr:%d/%d sar:%d/%d\n", c->w, c->h, av_get_pix_fmt_name(c->pix_fmt), c->time_base.num, c->time_base.den, c->frame_rate.num, c->frame_rate.den, - c->pixel_aspect.num, c->pixel_aspect.den, (char *)av_x_if_null(c->sws_param, "")); + c->pixel_aspect.num, c->pixel_aspect.den); + +#if FF_API_SWS_PARAM_OPTION + if (c->sws_param) + av_log(ctx, AV_LOG_WARNING, "sws_param option is deprecated and ignored\n"); +#endif + return 0; } @@ -296,7 +304,9 @@ static const AVOption buffer_options[] = { { "pixel_aspect", "sample aspect ratio", OFFSET(pixel_aspect), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, { "frame_rate", NULL, OFFSET(frame_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, +#if FF_API_SWS_PARAM_OPTION { "sws_param", NULL, OFFSET(sws_param), AV_OPT_TYPE_STRING, .flags = V }, +#endif { NULL }, }; diff --git a/libavfilter/version.h b/libavfilter/version.h index 8a9032859f..b029905ed4 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 7 #define LIBAVFILTER_VERSION_MINOR 70 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ @@ -59,6 +59,9 @@ #ifndef FF_API_FILTER_GET_SET #define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8) #endif +#ifndef FF_API_SWS_PARAM_OPTION +#define FF_API_SWS_PARAM_OPTION (LIBAVFILTER_VERSION_MAJOR < 8) +#endif #ifndef FF_API_NEXT #define FF_API_NEXT (LIBAVFILTER_VERSION_MAJOR < 8) #endif