From patchwork Fri Sep 3 12:20:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29977 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1234434iov; Fri, 3 Sep 2021 05:20:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgB+Y7cs5l3s01QGU8DPNXjMzc2HWpj2W2EYU0vsfRAtJjvC/CjJhaSGIvccqRWojEF5Ao X-Received: by 2002:a05:6402:1907:: with SMTP id e7mr3572057edz.201.1630671643487; Fri, 03 Sep 2021 05:20:43 -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 c11si4958279ejm.510.2021.09.03.05.20.42; Fri, 03 Sep 2021 05:20:43 -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=@outlook.com header.s=selector1 header.b="oqnKyJ/H"; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9BFEB68A583; Fri, 3 Sep 2021 15:20:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (unknown [40.92.90.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B0C7B68A073 for ; Fri, 3 Sep 2021 15:20:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iarbsdpG8nWBHmVBby1NQu5/iz+ytDS9cdJjX327r+eofcvPHmByFUajl01iPM3RqCLfVRNB9rQ/8dNo6fnTb7ampA7GWZgRrLVaaTg0PA4EuZze5T6Xqdyip/38W8WQleKRdzM8IlQDkW0U+gHegjAfjGap+3Iw3+PaTAhh42Bi6eVrVIOJF5oIphKnG9ogoAFCxC1jGPgfmH0GbgaUSXrthz4Pa7tWVa4d9CxHop+i/z4qS9V43AwGs3x714QEGUuHrYJBod/lKLp2xXaFdTaIogCqPI0Nstk2uZm9tfg8ob5Tt/sdrtY75SKlgZm/SOkMcvRpZt3rhR7HDkooEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=EWjQy4c+3kaMUZlJ/pRx7MJW2HMTk2wRnSyulmMGQ9c=; b=CI+m+BM6PD8DroHlIop/kY4LYYJ6HqE4iXdA+OZJ0TKboYo8mwlm6qbM3GvOKUXMG96dGigFJqpzZLZRIWAXT3geolqiY1hYW9q+uJfZRIfJGQC/MwXpB1BFprZWl8xnvC+3mSzqew7E7YKCocre8Rq5ZuuQFZr/P2li2IbE0sxj/Dle3voD+N8mjarXAWom0SfWKMiUOV7cK9AK1AyBX9Ggx6V0KrfCxpyc1Ij87e4Z33ExFoPDjXBKYwtyGgAfIswaEJMSlboY/L1D2Gn5B8L0oYr7hHD55x0b4EoHW0WD1yi3lPhZSeEkUzcLt+4EGCMYanhtL/Z6i0Wr8ehuiA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EWjQy4c+3kaMUZlJ/pRx7MJW2HMTk2wRnSyulmMGQ9c=; b=oqnKyJ/Hs/YxoIr1sM8EDScgTlhQe64tSb5tZmjcx5tT5faNVFydRnxRrcpYDdGHwCLz7cnNN9c4T2ye+8tyBRxQfiBSTMBQ9aE48BetQHSSOrBJ6UMQ8kJkI7twwvA1z6Y0ZckHOR9yJs2b3GWq86jGjnFKT+SJ/NS06L6VE0hl7ktcmh0MGvumAjOYWNn6AvyXt/J6bpiRwynNoYNnk3RrNjCOIp9jJFs+HyFLpd0vWeZETQqyHQmldmIlB2w53ZWT25beJQl1yPWPYmfi7jcsviSqye0MnJzrjR/BBMOzhip/E+7dHHcCN3k1UTMHsqKNgkLppaLgO81m42b/fg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6910.eurprd03.prod.outlook.com (2603:10a6:102:e9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Fri, 3 Sep 2021 12:20:30 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::2924:e83a:49ed:92f0%5]) with mapi id 15.20.4457.024; Fri, 3 Sep 2021 12:20:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Sep 2021 14:20:23 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [nN/0nzvR+1koSbeHEmzodmOn2oDL704W] X-ClientProxiedBy: AM0PR04CA0108.eurprd04.prod.outlook.com (2603:10a6:208:be::49) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210903122023.3006769-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR04CA0108.eurprd04.prod.outlook.com (2603:10a6:208:be::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Fri, 3 Sep 2021 12:20:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5fdaec1e-6962-4a11-e435-08d96ed5383f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTW2Vzrq2cduM4kXq+2PsWs0LmB7dU257RMfYzTlbBWgudg9K0u5ds/hxCXK+ydaGwqxc0L7VvUyFIQNlQO4bbC5RcCxVmA8CHTXjsSO02c+hGOdzqhYaXQfj2Ow0tn0uVE/oCrHIKDpWOtynZXl3ENipsDT2a03342qSRkd1RPTqQXVP79UY8v5qtucuAiBtm/23zo9lvIR7Bx5xPh2rhIHwFK9qKXTi4nVvCfv4DTDVmbmlZMvsUhrT/HWzBP4lvbSe5WwI0X8Ops3+G0rNbVaKDksDZI4U/vAbx5cEdKB92GqP6s188iY1naUfKQKXRkgUpQuU3SXnFTiMPfo3XXhQDgBr0cyuYw1NNZ9RRCQDH9U88uu9BRhHIE3G9SFBsGylZ92pP+3Lkj3aw9Tjj728FKlbjxXxEITZSTjNw+cqNEw/J9vmrlW+YTkPfPGbjUTeGhVgAVqMYX8o/uFO16Rf62SfnURjnGNijXJLLMMWaPbqrKlXCEwjilAJRr+bua1XrTcUiNtnbofA6TLCTartkCmV8ZW9pRcSWSm9MAlU+bt30MKdviN4/D/hGuG6g5QgVXFHUbzqRHGdXEHR9/d4A3zr3uPYTsMvIpdLMguw5geJ2hz9l0+PfXqCWU3awGgkJV1RDj5+7Q58lYarNT/1cBthf8Q6Y1wkBtt8jKcrxJWvV/lULWlbhvMAjZ+EpFJRgao0bMpGJshvUkCtXgJn/AD5hZeUvnidPffNGSZ2hV+nvAt1ynvdTosCfFuW8= X-MS-TrafficTypeDiagnostic: PA4PR03MB6910: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MoMWYQJj6MMYIx6gO94V5ctJuKsqR+k3cEVA3XGvXO1ZYeiW1NsStjavdiyq1+nkckstbi8+uDQZpGEVzG7LyJTbgK1xKWbmyOGXJZmkeHyqQKmZQa02GZEZeewfrgC3Cv1LiYDHDk1MY/MSzn0UhD30sn67RSsaLz90WFRPGFcMRNEtxgthSbSsaMum8nwUTv/V3s5usAUoS41tQhopTqUGVRZ5NsMW0i7PMmx91jC7fIzdEuTtlx6JCEGglMbv4Kx5FoSGalmDJ94u+sC0To5k5+6/jgV10iPTO1VYj6chcAsANQCcq9GTDrVQXJXGVXT9AbYuDy1UT+hfUqM9EWOKXdPlzp5F2HfA3z0x61nhYkSZP9td93KkJBqjoHld2ZxShnxDjWXoIyOG5TTm2SMsMvIFPHvQwk/RRXp6Xe8L5Wn6M7/HjzsZpGgIM21I X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Jv7kC1uAeVR93Kk8W+7mTTXuiEoyfnsCVbeK/jlfV7lGfa6RTTi3cLcLXExzNoEqRxdKZausvwyH/vjScNDcfeW3uwnAe9tcJ0o+2yNaV5SApAQpDgM6NxFwxlgyqKrGo8ZZY88MBV5WzG5MONRq2w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5fdaec1e-6962-4a11-e435-08d96ed5383f X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2021 12:20:30.5096 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6910 Subject: [FFmpeg-devel] [PATCH] fftools: Remove remnants of resample_opts X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: R33O5SOFUEsp These were intended to pass options to auto-inserted avresample resampling filters. Yet FFmpeg uses swresample for this purpose (with its own AVDictionary swr_opts similar to resample_opts). Therefore said options were not forwarded any more since commit 911417f0b34e611bf084319c5b5a4e4e630da940; moreover since commit 420cedd49745b284c35d97b936b71ff79b43bdf7 avresample options are not even recognized and ignored any more. Yet there are still remnants of all of this. This commit gets rid of them. Signed-off-by: Andreas Rheinhardt --- Will apply this tomorrow unless there are objections. fftools/cmdutils.c | 8 ++------ fftools/cmdutils.h | 3 +-- fftools/ffmpeg.c | 1 - fftools/ffmpeg.h | 1 - fftools/ffmpeg_filter.c | 9 --------- fftools/ffmpeg_opt.c | 2 -- 6 files changed, 3 insertions(+), 21 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index ae341184f6..c0d802dd52 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -68,7 +68,7 @@ static int init_report(const char *env); AVDictionary *sws_dict; AVDictionary *swr_opts; -AVDictionary *format_opts, *codec_opts, *resample_opts; +AVDictionary *format_opts, *codec_opts; static FILE *report_file; static int report_file_level = AV_LOG_DEBUG; @@ -86,7 +86,6 @@ void uninit_opts(void) av_dict_free(&sws_dict); av_dict_free(&format_opts); av_dict_free(&codec_opts); - av_dict_free(&resample_opts); } void log_callback_help(void *ptr, int level, const char *fmt, va_list vl) @@ -657,11 +656,9 @@ static void finish_group(OptionParseContext *octx, int group_idx, g->swr_opts = swr_opts; g->codec_opts = codec_opts; g->format_opts = format_opts; - g->resample_opts = resample_opts; codec_opts = NULL; format_opts = NULL; - resample_opts = NULL; sws_dict = NULL; swr_opts = NULL; @@ -714,7 +711,6 @@ void uninit_parse_context(OptionParseContext *octx) av_freep(&l->groups[j].opts); av_dict_free(&l->groups[j].codec_opts); av_dict_free(&l->groups[j].format_opts); - av_dict_free(&l->groups[j].resample_opts); av_dict_free(&l->groups[j].sws_dict); av_dict_free(&l->groups[j].swr_opts); @@ -826,7 +822,7 @@ do { \ return AVERROR_OPTION_NOT_FOUND; } - if (octx->cur_group.nb_opts || codec_opts || format_opts || resample_opts) + if (octx->cur_group.nb_opts || codec_opts || format_opts) av_log(NULL, AV_LOG_WARNING, "Trailing option(s) found in the " "command: may be ignored.\n"); diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index 0330ee3509..9caad01865 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -48,7 +48,7 @@ extern AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB]; extern AVFormatContext *avformat_opts; extern AVDictionary *sws_dict; extern AVDictionary *swr_opts; -extern AVDictionary *format_opts, *codec_opts, *resample_opts; +extern AVDictionary *format_opts, *codec_opts; extern int hide_banner; /** @@ -323,7 +323,6 @@ typedef struct OptionGroup { AVDictionary *codec_opts; AVDictionary *format_opts; - AVDictionary *resample_opts; AVDictionary *sws_dict; AVDictionary *swr_opts; } OptionGroup; diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index b0ce7c7c32..c3df955a6a 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -4926,7 +4926,6 @@ static int transcode(void) av_dict_free(&ost->encoder_opts); av_dict_free(&ost->sws_dict); av_dict_free(&ost->swr_opts); - av_dict_free(&ost->resample_opts); } } } diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index d2dd7ca092..b21a2376d2 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -523,7 +523,6 @@ typedef struct OutputStream { AVDictionary *encoder_opts; AVDictionary *sws_dict; AVDictionary *swr_opts; - AVDictionary *resample_opts; char *apad; OSTFinished finished; /* no more packets should be written for this stream */ int unavailable; /* true if the steram is unavailable (possibly temporarily) */ diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 21d54cc8ae..4b9ad3071b 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -995,15 +995,6 @@ int configure_filtergraph(FilterGraph *fg) if (strlen(args)) args[strlen(args)-1] = 0; av_opt_set(fg->graph, "aresample_swr_opts", args, 0); - - args[0] = '\0'; - e = NULL; - while ((e = av_dict_get(fg->outputs[0]->ost->resample_opts, "", e, - AV_DICT_IGNORE_SUFFIX))) { - av_strlcatf(args, sizeof(args), "%s=%s:", e->key, e->value); - } - if (strlen(args)) - args[strlen(args) - 1] = '\0'; } else { fg->graph->nb_threads = filter_complex_nbthreads; } diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 428934a3d8..bd8f26ce2f 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1628,8 +1628,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e if (ost->enc && av_get_exact_bits_per_sample(ost->enc->id) == 24) av_dict_set(&ost->swr_opts, "output_sample_bits", "24", 0); - av_dict_copy(&ost->resample_opts, o->g->resample_opts, 0); - ost->source_index = source_index; if (source_index >= 0) { ost->sync_ist = input_streams[source_index];