From patchwork Sat Jul 23 14:09:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 36921 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1048099pzb; Sat, 23 Jul 2022 07:13:39 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ut1pjit/rLcGzpSeOjjjAoBj1OlVljfai8ofs6oY4qYGsw5yLzSRg3ktZ5VaoomyhrrzHk X-Received: by 2002:a05:6402:46:b0:43a:f611:5992 with SMTP id f6-20020a056402004600b0043af6115992mr4716253edu.18.1658585618847; Sat, 23 Jul 2022 07:13:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658585618; cv=none; d=google.com; s=arc-20160816; b=T/H5mrUB7fY98k+vHEiaD+Sgiy4QAtQsj2ks5N7tWOdldFmfCE21+QWJDgrmlbUz6l ZG2cIJCeF8aAkjff/rA84rsZL6g7OHPilvn0Ahi++TEWWQaDE8IfDKQgkFizPXJ5cmun 0XxYpV7WyTy/hLDCFf+C85cu+8gYhHBB4RBAaB4Mau4G8AnSrB12r0NoGqSLyRvhhZzp jougSSBOPxbktL3UfbLCdOt0bklTxZ1qQ+5zHqsgBf/gU3Pk833DTTl6zyusyLBxqzXY MBSxsFsN3IrcJU8Oc1aONrqBxApfJ+1YXpAbOUqD6Y77vVmBLFCsxomC1pP8xKUJL+Z3 ZKew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=Fur+Dy1+f5O+lI/CMpuk//7wxyvzywruT6JkmkvFY3s=; b=ZZkSNp52n34kIBhqx+nKxzKBfWMzHNFeZgN5ByOqT571/uN+gXbz9dXD2GKNiQcjAy hyrxxwu8zGQZQrBsbpt9gTk8WITAJHwMdsubUTzZx3qNmDe3/woBe0jMoQyFzC6XlZPj eGAs4GsNMqZvYCaaUx/e1XiSEG42KjKQormn4JNCi3MD/eBUUhA4QbY6SkW/zpOW5X2F fScy5Wi/q+TfOvvyDxanuSd0HZjEiMzNuZjZNPxlY2+sC1yd/Ihcw3/EgeNhkCraLmux dOWjova142pjjrdZr0617WnXY1olhQGNurluvi5uxbe1z8JQQRLnpZvn2OxWaDZoHeqY o5MA== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gt15-20020a1709072d8f00b00722e66b9403si10276258ejc.603.2022.07.23.07.13.38; Sat, 23 Jul 2022 07:13:38 -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; 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 9EAC568B8E5; Sat, 23 Jul 2022 17:10:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA1D768B7F3 for ; Sat, 23 Jul 2022 17:10:26 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B864C240511 for ; Sat, 23 Jul 2022 16:10:22 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Cw_oEeWodGWL for ; Sat, 23 Jul 2022 16:10:22 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 667E92404FE for ; Sat, 23 Jul 2022 16:10:19 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 681AF3A03FD; Sat, 23 Jul 2022 16:10:19 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jul 2022 16:09:31 +0200 Message-Id: <20220723140952.31814-6-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220723140952.31814-1-anton@khirnov.net> References: <20220723140952.31814-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/27] fftools/ffmpeg: drop the -vol option 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5jbNyq6Jyw+I It has been deprecated in favor of the volume filter since 2012. --- fftools/ffmpeg.c | 4 ---- fftools/ffmpeg_filter.c | 10 ---------- fftools/ffmpeg_opt.c | 3 --- 3 files changed, 17 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 1cf704ab82..1780e535ae 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2840,10 +2840,6 @@ static int init_output_stream_streamcopy(OutputStream *ost) switch (par_dst->codec_type) { case AVMEDIA_TYPE_AUDIO: - if (audio_volume != 256) { - av_log(NULL, AV_LOG_FATAL, "-acodec copy and -vol are incompatible (frames are not decoded)\n"); - exit_program(1); - } if((par_dst->block_align == 1 || par_dst->block_align == 1152 || par_dst->block_align == 576) && par_dst->codec_id == AV_CODEC_ID_MP3) par_dst->block_align= 0; if(par_dst->codec_id == AV_CODEC_ID_AC3) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index f715ecb6b6..6807bf384a 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -913,16 +913,6 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, // av_bprint_finalize(&pan_buf, NULL); // } - if (audio_volume != 256) { - char args[256]; - - av_log(NULL, AV_LOG_WARNING, "-vol has been deprecated. Use the volume " - "audio filter instead.\n"); - - snprintf(args, sizeof(args), "%f", audio_volume / 256.); - AUTO_INSERT_FILTER_INPUT("-vol", "volume", args); - } - snprintf(name, sizeof(name), "trim for input stream %d:%d", ist->file_index, ist->st->index); if (copy_ts) { diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 8ac73c0efc..81754f7d91 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -157,7 +157,6 @@ float audio_drift_threshold = 0.1; float dts_delta_threshold = 10; float dts_error_threshold = 3600*30; -int audio_volume = 256; int audio_sync_method = 0; enum VideoSyncMethod video_sync_method = VSYNC_AUTO; float frame_drop_threshold = 0; @@ -4029,8 +4028,6 @@ const OptionDef options[] = { { "atag", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_old2new }, "force audio tag/fourcc", "fourcc/tag" }, - { "vol", OPT_AUDIO | HAS_ARG | OPT_INT, { &audio_volume }, - "change audio volume (256=normal)" , "volume" }, { "sample_fmt", OPT_AUDIO | HAS_ARG | OPT_EXPERT | OPT_SPEC | OPT_STRING | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(sample_fmts) }, "set sample format", "format" },