From patchwork Thu Jan 13 01:49:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33296 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp12921iog; Wed, 12 Jan 2022 17:53:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyFIRDtB47GKptrHTK+rASx/D+950uO9ybXaiQJtblNy+GAIQjesAvmD3rf6a8HbqUqbX45 X-Received: by 2002:a17:906:ca18:: with SMTP id jt24mr1935471ejb.23.1642038805207; Wed, 12 Jan 2022 17:53:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642038805; cv=none; d=google.com; s=arc-20160816; b=t9YuJKjHv6Xj1M9LAhGs8XoTWlnMbrdwZP0SbaBtVEsIJPws6lSAYZvKZ+Bfj9+53M HvqN1vvkvywpE6D1unMwFV9p7XWpv1t4K54gr3hQ/FXu/qiLA465AWkIxuX6JOk8T8dY CHHVWwuN9jJjo5gcO3Smr2KbVQVSdeAWrG0KKVMk2GxKKo3imM7yj7WY7qQ0RgAB2L5d Ps5nzNvkgMbeJzk6T35oz4LJBkJwKJsNJ5sR6Smc8mTFPeOxccsnyZM80rFjl1+4zYd7 3FlkyLGM2GCs0b4YegMg9U3so1XBLtkoOstOVpcVGB96/GD5byl2vQp+v8Dkz4mT2fpC QknQ== 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=TXdSxOJvzfTtojCL8WLGRzOMQRQgeyALMxMTlXehHDY=; b=ze0ly1LxPr2yE4nwHNMAIOZ9dSXJ+9kdsGid9saqDx/uppGh7Q/c4tuFnuVuQGbFMp hz4TC/JLdSAtL1+oe/PpdC6oC5YN1zRpARMywz+3WbSNKVcfD/bHZLzLGynPLVyE7J3P 8rwpy8XchaVbZBqUxYBR7R4ISQkjRl7ZJ1JElFeq/q8nYQlIq2gceNeiIczVDCT0SgVd FcyEZ4Xycwaem3NoZrT3VMSgvwYlBglXTgvuYT5EtwMPEOhs00GX6h56Iy572Jt1hkhY hPVysz3A1NohiPa3JYLKEsXEAJRDwrPHvFt2Uq24tl+SNCE7rMoPrnipWSdA72uoVdJ8 k/0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ZB0Vnm1J; 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 hc10si842314ejc.385.2022.01.12.17.53.24; Wed, 12 Jan 2022 17:53: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=ZB0Vnm1J; 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 1A6F168AF45; Thu, 13 Jan 2022 03:52:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96F1B68AEEC for ; Thu, 13 Jan 2022 03:52:09 +0200 (EET) Received: by mail-qv1-f50.google.com with SMTP id a8so5143086qvx.2 for ; Wed, 12 Jan 2022 17:52:09 -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=1Y6rlVAAr4ZJE9SeNJo01tD1/841ETJx9mrXZWfxtlE=; b=ZB0Vnm1JKhhEK0PKQDuzIQofiEmhQenf8A2XvJ4Ty29s0eAUuNMb28PfuxcsBqVroK UtFt0r8L4ww7boo6ZMovg6tjMq2M73zyHRfF3ZoL0FkES8e2/8o8TKFmysz3YK26ePhX c8r8637WwEWMTqs/sWpx/hQXntuFMegeQwXkrRioRqs7JyoOt2snY/19gZXABKcBbZrj 6AHwsJP7dQdPDQnfOWA0dKb9sXVHDVkbl/kLLcSRl/lTOYcsQ3+WJrp+Ugian4o3872c CQdJIY5fwecTFEP3vQF0FQQHcjekicqZg5t2Z92K+gVRdYn5R67NZYcqMOcJ0ixm9Doy YmlA== 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=1Y6rlVAAr4ZJE9SeNJo01tD1/841ETJx9mrXZWfxtlE=; b=SqqrU6MzqUzHq5docj7AeMj1343pOEm4QT0jgSbjARZYY33vwWZKHd3Z9SUpH0Xmd9 cngxDd2mATqVtubdGb9ayW//og++/CWd9hjH2rpQ5R4oifWZ5CGj1NzqXM5+3PjOiDUg 0ETXfRlXQ83ex0Za/JlLyBddub5I1q9KVmwNSl4tBaSA6fRe+TfyjgUfZ+9Pj4ziPULH Y7q9WJZXgX2VMfu7S51Wws0dYd4uO6VdWcPe3mLUpNhf+TZ0D2hkNXFIdd888hKVbCWO s2WLu10eZJnfA1/YMUeNklqUZzxEarEjz1Q8S/jW6mv9HRqcExkCdNIjhfFOuV+zekdZ JroQ== X-Gm-Message-State: AOAM531ybO8ibsPZ/aC6Ace22c64VfWTV9Li36dQUxnTpMhxqJAf6k8l OhXvFt3mRsRwEa/JkfIn0XDhpYTjP3c= X-Received: by 2002:ad4:574f:: with SMTP id q15mr2333470qvx.94.1642038727774; Wed, 12 Jan 2022 17:52:07 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:07 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:30 -0300 Message-Id: <20220113015101.4-9-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 008/281] 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: lJ2YuUj4tuL+ 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 c78c6c16a2..29c5f7539c 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) @@ -1333,8 +1345,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 775e3e0d76..68983c773f 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 7468ec301d..1667d6f6f5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -525,7 +525,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); @@ -1522,7 +1522,7 @@ static int match_stream_specifier(const AVFormatContext *s, const 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;