From patchwork Thu Jan 13 02:00:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33451 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp36298iog; Wed, 12 Jan 2022 18:31:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJwtYaR/J8ouCma81erPcdt8hjPc5PgK0Nxfh866SNvBMlbjZveS1loRFCHfsB2SVNFUp+NN X-Received: by 2002:a17:906:417:: with SMTP id d23mr1924112eja.469.1642041091058; Wed, 12 Jan 2022 18:31:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041091; cv=none; d=google.com; s=arc-20160816; b=I4278nw462oYocKcUBNQeAgA9Wqvz6Od2LSphqBAg83mD3WVSoEOGN4wgHkacZTpid gKkLlx3bYnUexHu9uH3cxz0HXMm8iy/n5gWrpM+ry114+XdS0ppi+Li5hQlg77bt496K vE4fkMoN+NZHqJivm2on53lw72wn/1DjJYk9s4RK3robOxRR12fG2pxvMITN4y0IXFnl XlFEyNH/mR+R9UufbYCsAR6cczbjoRIxAWDaNsHxk6u+SYMgohQ0K5Wtzgvr1ghxOlEH 4FtpInDxsobLzYykiYM9rOptF4PWH1E/2KdlN/ybTlKlMNiRIR27Kvob52dm+S7/CV4c 4rPA== 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=KpsciU/CmjPGirlu2ypTNol6g7SR58X87F5SdFFdyIY=; b=qVkXVUqD1wcmCDGGgxK4SV9JizPv8kV/Ui8uO//s1elYthG15op1GGWJ0QY0EV86d9 xHzexwHjwemqBCR5efi2tIdk2CHRRhtFKz+TZ5G4A4D+au8i6kfGm8ngIa4Wl/rdKKUk jnGItVkZfCh8flrZoNOYlGtwKh/SJB4rT7/rMkNaioBxHli875aM/ag5F1LFpBjSidPX 7kBFTeUOHaVQt+NGTyrPw+rIhvhkhmb3dOLVQhFdOG6JiV/YPwHNnvO3za6fzL775lbc DhgISfExYTo5Ue1igI2dfG0RKW17c2Th15e+Mv4XdRJbgtjlz6eK/hKwiDLYo0YsLYbb 4wxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ITdBw1aN; 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 ne35si992486ejc.748.2022.01.12.18.31.30; Wed, 12 Jan 2022 18:31:31 -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=ITdBw1aN; 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 F14FB68B574; Thu, 13 Jan 2022 04:01:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3FF168B549 for ; Thu, 13 Jan 2022 04:01:40 +0200 (EET) Received: by mail-qv1-f45.google.com with SMTP id p12so5100659qvj.6 for ; Wed, 12 Jan 2022 18:01:40 -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=npsKb3Myfh0z3u7OF4WL10b9N1CHudhgs6f1jIjiMag=; b=ITdBw1aNBrURTHInQffBW4KqRdo5UXHJd6N3CL8gecSWx6Pph0m++5X2ITkOaMMW59 mSTWmc8DjopOFjbVm6GdLwTs+L8d/rk93fRA8WiJeXe2FuDMH5sYG6QLk4AvQbTxEK27 FGcRHe86uISWE49C0AQoWWNfinYmdO3rspm4QjjfMYD4ZZ6rPgYorBr18qlsM47Fk/za IiYCWy7JgEXQom4UurPVqadQFIH1tWxmxESTFJ0SEciCu0v8Kji+BtgE7O7abvGdMVS8 Yjh9JJWgWZfcpPTtUPEZEAJzZYYjn4nC5EzbDxhepwnfCC9PsqoAwH+KihTgfzjkk42c Kc+g== 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=npsKb3Myfh0z3u7OF4WL10b9N1CHudhgs6f1jIjiMag=; b=mwy98+FiNXkGcMLKzN/orfwSg/mLqS1OJajqQT213EdFu49s0lWbZsazYoJBAa16fc /Tfpq5InGmXfrUS994jADNYNoYecnBH2oi2YOkg2/wOuwui7usXtkHcQu3EOn4e6Z+qI cO/Lc4EfXrHgplnh72yxl1GWuOQB25o43eVBl2jK/O4f/7FYWMhIk0aKigtpoPksDwc1 Wt1Mfl/dPatqI5TI3U2v17QQAzl/mWZd2FsU/KFsqbIilsq/fmfgmiw7yBQoe0jtSCJ9 LkmFCcSQoBohq/Z1CbN5Rh2PjnClf43kHEoyc+2LLpmiyJ18izS2UWgoyF9wfnEOKmTt 5uKA== X-Gm-Message-State: AOAM533l+GPEVeyO88a0GoSsDVYhg7SO+EyHLJJ3IU6GBaTtwI1UgrX9 YJqmOdcyqGS5BTNw9ZF81k25vS7peyA= X-Received: by 2002:a05:6214:230f:: with SMTP id gc15mr2191819qvb.98.1642039299435; Wed, 12 Jan 2022 18:01:39 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:39 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:23 -0300 Message-Id: <20220113020026.590-28-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 176/281] wsd: convert to new channel layout API 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: 4fSJvtqOZmnT From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavformat/wsddec.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavformat/wsddec.c b/libavformat/wsddec.c index 1f90f5b467..a8754f84e4 100644 --- a/libavformat/wsddec.c +++ b/libavformat/wsddec.c @@ -128,18 +128,22 @@ static int wsd_read_header(AVFormatContext *s) st->codecpar->codec_id = s->iformat->raw_codec_id; st->codecpar->sample_rate = avio_rb32(pb) / 8; avio_skip(pb, 4); - st->codecpar->channels = avio_r8(pb) & 0xF; - st->codecpar->bit_rate = (int64_t)st->codecpar->channels * st->codecpar->sample_rate * 8LL; - if (!st->codecpar->channels) + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_r8(pb) & 0xF; + st->codecpar->bit_rate = (int64_t)st->codecpar->ch_layout.nb_channels * + st->codecpar->sample_rate * 8LL; + if (!st->codecpar->ch_layout.nb_channels) return AVERROR_INVALIDDATA; avio_skip(pb, 3); channel_assign = avio_rb32(pb); if (!(channel_assign & 1)) { + uint64_t ch_mask = 0; int i; for (i = 1; i < 32; i++) if ((channel_assign >> i) & 1) - st->codecpar->channel_layout |= wsd_to_av_channel_layoyt(s, i); + ch_mask |= wsd_to_av_channel_layoyt(s, i); + av_channel_layout_from_mask(&st->codecpar->ch_layout, ch_mask); } avio_skip(pb, 16);