From patchwork Sun Mar 20 19:36:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34867 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1115234nkc; Sun, 20 Mar 2022 12:38:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9lLchmFOJzNEmnhZhkgTuonrMEgOcW81O/SqmC0UsnoZcFnyRzA1a5CxR2bu7W09OUUb4 X-Received: by 2002:a05:6402:458:b0:418:78a4:ac3f with SMTP id p24-20020a056402045800b0041878a4ac3fmr19604571edw.196.1647805106419; Sun, 20 Mar 2022 12:38:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647805106; cv=none; d=google.com; s=arc-20160816; b=0Tcjypyb3POrjum/DNWAaLVR9Bzd3F/7bjh1gNLuuLbrkCbj4hc9bwl0e1nFZ5S1WJ FWi7Ba/eXefvsVPTszrDoFT7aR+Kg9KBgOClRRvtTl+qeNoYgxFebcty+sJ8CnYKEnPf DOQgp7SdnAJa0jerDWVNYFPXg0OupHitNo1aU9A7Q/xj2JbmijiAZyx0QEiBAfTD1L+Z zPNKywua9dXvuZ30Mt33Fbwn8wLSqrK9O5a/6ygf4zyDm7/pFTFAPQR8zexVQ1j8DK/n v0Mx0ExcFbknxJmS+Cp5o94wGDtRxhMu4tunhJz/nSXTn4SAPhIdyqGVdKG10cZQPSg2 Asqg== 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:dkim-signature:delivered-to; bh=RXA9lFRW5bCEHP9Zj0wwUANrehXHmOcqwJBkOdkLoP8=; b=Uzl1xP9STdgZwymu1NUqz64YpCZO6UgXYZBCqI6Xg65D72KU54ufPUK0rbgseSobcH 0aoLaWAq8CB4328CbXqHCMFmfiT8ZV6bBPz3/V3qjUjNTh+b7QS67mWnVCc/b+ZNl7QB U7CVmZ2G/VPo0ohPZQrCiiaCIL+Z+aXpIEA2BxTxSvZ5Y7XF7i6i+srmotrDkFr+FnuP kBdiR5f3U+PtmWD7qEBHpNalNvlbdMy+pb5TxrwOrMdvkk2/GAWtvV1dZDJuDJStFygO HzZOiuTfrQrxtyP56BiZjNIbDUDrMT1nrtTTp8M4Qb+RezK76OC3zv26PobMnT93cTP8 BQNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QPy9N67k; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n18-20020a50c212000000b0041945e1fb47si154154edf.614.2022.03.20.12.38.26; Sun, 20 Mar 2022 12:38:26 -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=@gmail.com header.s=20210112 header.b=QPy9N67k; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D88C568B195; Sun, 20 Mar 2022 21:37:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f54.google.com (mail-oo1-f54.google.com [209.85.161.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20D0A68AF5D for ; Sun, 20 Mar 2022 21:37:26 +0200 (EET) Received: by mail-oo1-f54.google.com with SMTP id y27-20020a4a9c1b000000b0032129651bb0so16888045ooj.2 for ; Sun, 20 Mar 2022 12:37:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=f8pQIm59VEOYXoCaqwbXhuL7IW1XJU7OTodeb+Z9CPU=; b=QPy9N67kynnOFUMw6dWJ+oPIEDUwAp27ajxa2BkrgjCGJVZLzDH7d717GotBJRYbtg 688vYAs+Occ5QZG0v9ZvPVoLzxqzrfttow5xzo7i3pLYqwjNwvfIvcv2qz3MrSeU9F3x VvuTx2nO3FqJTAKIpkuioyx72gUudaDB1wLyDHPAI0kETUESX9cDkiJytTFJ9RFNtDJn pbjgfSoGbfJvkXUOQND/eIUT9G03xMgNH/PqvvAFqcwnQbnpSMBMBHCObhR36Iz/dHLf StCog+V+GfUm2VS0BMiiCruXk8Dxh7AjrbcmkEq4fKWFVxhjA4zAnIXolZtPUPBDFwdJ qGfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f8pQIm59VEOYXoCaqwbXhuL7IW1XJU7OTodeb+Z9CPU=; b=GFsnE8fnkIXoBeA/lxstDh9Ck+oFkPEgy0suwgrORcc/GZqv76pVHWgEtA9oTaEFiF rQiry0CTJRSe6jbEs6wC5LrFptojCHl6CHOmgeY+3WHpBGspzgIS6xZcq04Tx4roK+vB hubWNh3CJsGwEsYfjpLM3bYUhr0DSBq7AwvSqh3RObYUrAmO33hVzT8kKbozJ2USobK8 i/tC6RkfrNS9fy1gXU8HC5RSvxvjpfGGo2N63MY4GO2EEUORd7bj4XtjZhCHh7hU0iwV J5RKmuk+bl+FQnGSrjPzX9T62ZZvDNqpO//z12vVoSztNvlLJgjWGCbHjniqTztDG/9h paqw== X-Gm-Message-State: AOAM533OeswovZspGdnvdlItwa4aApKSMsDj7owoatFQqBmgRYCt24XU TDcn2W/VggxOjhNPDy88G/teCnpFHjZqbg== X-Received: by 2002:a05:6870:4691:b0:dd:f2ca:f5d8 with SMTP id a17-20020a056870469100b000ddf2caf5d8mr2775693oap.57.1647805044541; Sun, 20 Mar 2022 12:37:24 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y15-20020a056870b00f00b000d75f1d9b81sm5418483oae.46.2022.03.20.12.37.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 12:37:24 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Mar 2022 16:36:19 -0300 Message-Id: <20220320193619.51185-7-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220320193619.51185-1-jamrial@gmail.com> References: <20220320193619.51185-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/7] ffmpeg: deprecate the ac 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: Gte1cCADsdSl Same as the AVCodecContext option. Signed-off-by: James Almer --- fftools/ffmpeg.h | 2 ++ fftools/ffmpeg_opt.c | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 1e14bf9fa9..d0bc4b6afb 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -98,8 +98,10 @@ typedef struct OptionsContext { int nb_codec_names; SpecifierOpt *audio_ch_layouts; int nb_audio_ch_layouts; +#if FF_API_OLD_CHANNEL_LAYOUT SpecifierOpt *audio_channels; int nb_audio_channels; +#endfi SpecifierOpt *audio_sample_rate; int nb_audio_sample_rate; SpecifierOpt *frame_rates; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 720a3cc46a..4b8de9f2c3 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -54,7 +54,9 @@ #define SPECIFIER_OPT_FMT_dbl "%lf" static const char *const opt_name_codec_names[] = {"c", "codec", "acodec", "vcodec", "scodec", "dcodec", NULL}; +#if FF_API_OLD_CHANNEL_LAYOUT static const char *const opt_name_audio_channels[] = {"ac", NULL}; +#endif static const char *const opt_name_audio_ch_layouts[] = {"channel_layout", "ch_layout", NULL}; static const char *const opt_name_audio_sample_rate[] = {"ar", NULL}; static const char *const opt_name_frame_rates[] = {"r", NULL}; @@ -1114,6 +1116,7 @@ static int open_input_file(OptionsContext *o, const char *filename) if (o->nb_audio_sample_rate) { av_dict_set_int(&o->g->format_opts, "sample_rate", o->audio_sample_rate[o->nb_audio_sample_rate - 1].u.i, 0); } +#if FF_API_OLD_CHANNEL_LAYOUT if (o->nb_audio_channels) { const AVClass *priv_class; /* because we set audio_channels based on both the "ac" and @@ -1125,6 +1128,7 @@ static int open_input_file(OptionsContext *o, const char *filename) av_dict_set_int(&o->g->format_opts, "channels", o->audio_channels[o->nb_audio_channels - 1].u.i, 0); } } +#endif if (o->nb_audio_ch_layouts) { const AVClass *priv_class; if (file_iformat && (priv_class = file_iformat->priv_class) && @@ -1959,11 +1963,13 @@ static OutputStream *new_audio_stream(OptionsContext *o, AVFormatContext *oc, in char *layout = NULL; char *sample_fmt = NULL; +#if FF_API_OLD_CHANNEL_LAYOUT MATCH_PER_STREAM_OPT(audio_channels, i, channels, oc, st); if (channels) { audio_enc->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; audio_enc->ch_layout.nb_channels = channels; } +#endif MATCH_PER_STREAM_OPT(audio_ch_layouts, str, layout, oc, st); if (layout) { @@ -3795,9 +3801,11 @@ const OptionDef options[] = { { "ar", OPT_AUDIO | HAS_ARG | OPT_INT | OPT_SPEC | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(audio_sample_rate) }, "set audio sampling rate (in Hz)", "rate" }, +#if FF_API_OLD_CHANNEL_LAYOUT { "ac", OPT_AUDIO | HAS_ARG | OPT_INT | OPT_SPEC | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(audio_channels) }, "set number of audio channels", "channels" }, +#endfi { "an", OPT_AUDIO | OPT_BOOL | OPT_OFFSET | OPT_INPUT | OPT_OUTPUT,{ .off = OFFSET(audio_disable) }, "disable audio" }, { "acodec", OPT_AUDIO | HAS_ARG | OPT_PERFILE |