From patchwork Wed Dec 8 01:06:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 32140 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7044662iog; Tue, 7 Dec 2021 17:09:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwaOWxF2JnBIPHRairOhLa0KPpTYQDr5id1v9xNctemsQ2ID9TkS/vT3zRUmJHDdrzeKRL3 X-Received: by 2002:a17:907:a40c:: with SMTP id sg12mr3426125ejc.408.1638925765824; Tue, 07 Dec 2021 17:09:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638925765; cv=none; d=google.com; s=arc-20160816; b=XxGUGjHueUeec8VmugXORkmf0awKWeVeB/OrJ7RAOjvLmYALdkWJMW3cv1BUcmgzZl e/yknEW5OXIIPPynp/eQbQt6yhAtsE0tjJ6ZjvDK5lQ/bkhiRTyU+0P5s8URaTqaH0S6 5t9jnn40nbvlcldDhlkMSjjHhx7sNflzk1GjRlSRR5nUwq2ckqffjeYD6cwDavtXajM/ IUaVC0Qrw0ltQ25STpden/ICqnVmvqonvZtWubKN5C75QSNH7vXdr0UkF6AOXQuB1NtA v5pKJDC0FfdIas/1HodM5RyP3J/HGGsy/V35Q6+9eo6dGLoBKuiQYJa2j2H/XfOTMt83 sXvw== 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=5jf438z68rv49BsjSPcYlGpl+eEDFzUga/UsmbcxbV8=; b=rHNDkwF990FEDK+U18VMShpxyZQ6AACp4e1xgP3blY7fAGfi+QDw5djm8AT6Hf78yD 5Y3qkskKnJ3zpC0lyXYL/SFqhSL/fR09LsSGi2gu2WgVqwgm1OmqftSVD2A0TzYCmtF2 1st2aQn63QJ6RkckIFvRMFlbTKm2lXZl5rLSr5O2gAElu8UbxhRXy0nNseiv4XEt1ZSY NL9Sb/mB0D7mRKdM1hhF0fRW1sYt8goaGnZeGcd4GTc05xmwN7fVP2STyhI4SzDqpl5V wW5iVR7Ee+dvY47HYzosH88h3shBEmZJlt8Jom1JwF94bPYB1QTpdx+8zjZH/9XX1YtY g0PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="fDWn2KY/"; 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 l2si1863623edf.22.2021.12.07.17.09.25; Tue, 07 Dec 2021 17:09:25 -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 header.s=20210112 header.b="fDWn2KY/"; 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 1D14E68A852; Wed, 8 Dec 2021 03:07:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f50.google.com (mail-ua1-f50.google.com [209.85.222.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E7A168A3AD for ; Wed, 8 Dec 2021 03:07:37 +0200 (EET) Received: by mail-ua1-f50.google.com with SMTP id ay21so1842983uab.12 for ; Tue, 07 Dec 2021 17:07:37 -0800 (PST) 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=xPEgOyiS75t0KeyWxHXWrfXy7GljlnHSo205AIZFtBc=; b=fDWn2KY/Upqat/ei6aceueEC8lnKJWU1hzxTB42y3oGXdp5oTb69mUO3APnTk2Ety5 yTiJk1p9mPrkh66U3VNimK3EVpoyaVpnw9h6xTwHoIPuFK11BOHyqYYaX0+qo318uo7u 3fM3eSS6ch/U6M/h4DulPMJcz1idkLpeYPf7or4oFkVIwzDIYQ4gYF3f7/bw00evCIAC vRR+oVYmExqgrd9ZosiLLTorSkV3V5R7HBOttmRfz/TC2dUa7mVyFaOGoc9vmMV0aG69 gfRHk+D6IwIUg2vVqxNWBEi5WOLtu2PV9Hd66CpGGYNLET0WKewcyhVDcAbpunAGpMBp +Wjw== 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=xPEgOyiS75t0KeyWxHXWrfXy7GljlnHSo205AIZFtBc=; b=hBm5fQ5hCovuQksviMEewTGP90giNyHXbVbMUKXUe1kUXjI44xFvwej2aGHhsE2Qw9 wbO8F3TnHAJRu3YvP/55qmJEyy2Y58tw3S3WBhcubtIrSWGcSsAYZ9m8f5J/L0QEjaWD Ah/hrkOQ+TNlG5BQUZWHdr3crp7jp8Iw3JXklcLzY3JMjfO12jm3vQAzLQL0+i1KKPu+ 0den6kMeyv7eLb2R5j8Lt0S5eSHN69pRvfIrsnOWgmyzmgqWbSFi0KIW2JfXCyyzaVUo Xrq3sPfJf3HnLmmlqMItuWGk+dq+fnR7AU/T6xV5KiZQ1IQnqarP6H/y9sAjJ/VtsiQT baog== X-Gm-Message-State: AOAM532PndcUUu8KL8Dher3+ctccwAHR3AW/jgiWzUcDXNYA1d6zepAF jrqvrAWpAXkMxZTjhZi3NFh/rVPpxjy26lb4 X-Received: by 2002:a67:b208:: with SMTP id b8mr48902442vsf.77.1638925654670; Tue, 07 Dec 2021 17:07:34 -0800 (PST) Received: from localhost.localdomain ([181.170.250.138]) by smtp.gmail.com with ESMTPSA id b8sm949898vsl.19.2021.12.07.17.07.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 17:07:34 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Dec 2021 22:06:24 -0300 Message-Id: <20211208010649.381-9-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211208010649.381-1-jamrial@gmail.com> References: <20211208010649.381-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 008/279] lavf: convert the generic layer to the new channel layout 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: xr/AmfUP6qS6 From: Anton Khirnov Signed-off-by: James Almer --- libavformat/demux.c | 16 ++++++++++++++++ libavformat/mux.c | 18 +++++++++++++++++- libavformat/utils.c | 4 ++-- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index cb02c84f33..3bfd753f64 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -206,6 +206,18 @@ static int update_stream_avctx(AVFormatContext *s) } } +#if FF_API_OLD_CHANNEL_LAYOUT +FF_DISABLE_DEPRECATION_WARNINGS + if (st->codecpar->ch_layout.nb_channels && + !st->codecpar->channels) { + st->codecpar->channels = st->codecpar->ch_layout.nb_channels; + st->codecpar->channel_layout = st->codecpar->ch_layout.order == AV_CHANNEL_ORDER_NATIVE ? + st->codecpar->ch_layout.u.mask : 0; + + } +FF_ENABLE_DEPRECATION_WARNINGS +#endif + /* update internal codec context, for the parser */ ret = avcodec_parameters_to_context(sti->avctx, st->codecpar); if (ret < 0) @@ -1335,8 +1347,12 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) return ret; st->codecpar->sample_rate = sti->avctx->sample_rate; st->codecpar->bit_rate = sti->avctx->bit_rate; +#if FF_API_OLD_CHANNEL_LAYOUT +FF_DISABLE_DEPRECATION_WARNINGS st->codecpar->channels = sti->avctx->channels; st->codecpar->channel_layout = sti->avctx->channel_layout; +FF_ENABLE_DEPRECATION_WARNINGS +#endif st->codecpar->codec_id = sti->avctx->codec_id; } else { /* free packet */ diff --git a/libavformat/mux.c b/libavformat/mux.c index fc9199230c..9dd6b13ac8 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -282,8 +282,24 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) par->ch_layout.u.mask : 0; } +#if FF_API_OLD_CHANNEL_LAYOUT +FF_DISABLE_DEPRECATION_WARNINGS + /* if the caller is using the deprecated channel layout API, + * convert it to the new style */ + if (!par->ch_layout.nb_channels && + par->channels) { + if (par->channel_layout) { + av_channel_layout_from_mask(&par->ch_layout, par->channel_layout); + } else { + par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + par->ch_layout.nb_channels = par->channels; + } + } +FF_ENABLE_DEPRECATION_WARNINGS +#endif + if (!par->block_align) - par->block_align = par->channels * + par->block_align = par->ch_layout.nb_channels * av_get_bits_per_sample(par->codec_id) >> 3; break; case AVMEDIA_TYPE_VIDEO: diff --git a/libavformat/utils.c b/libavformat/utils.c index 7643e5ca10..269223aaa8 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -526,7 +526,7 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type, continue; if (wanted_stream_nb >= 0 && real_stream_index != wanted_stream_nb) continue; - if (type == AVMEDIA_TYPE_AUDIO && !(par->channels && par->sample_rate)) + if (type == AVMEDIA_TYPE_AUDIO && !(par->ch_layout.nb_channels && par->sample_rate)) continue; if (decoder_ret) { decoder = ff_find_decoder(ic, st, par->codec_id); @@ -1512,7 +1512,7 @@ static int match_stream_specifier(AVFormatContext *s, AVStream *st, int val; switch (par->codec_type) { case AVMEDIA_TYPE_AUDIO: - val = par->sample_rate && par->channels; + val = par->sample_rate && par->ch_layout.nb_channels; if (par->format == AV_SAMPLE_FMT_NONE) return 0; break;