From patchwork Thu Jan 13 01:50:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33328 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp17049iog; Wed, 12 Jan 2022 18:00:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJx4mBKGaVB6JdNi7mvVJqNxZrg0UsfmdZsuRtonfiVOCk2+D8WvrRhKOgldMZS06mmhirAM X-Received: by 2002:a17:907:da1:: with SMTP id go33mr1815205ejc.491.1642039254534; Wed, 12 Jan 2022 18:00:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039254; cv=none; d=google.com; s=arc-20160816; b=TvqX451HrRM7Ndde0QTax6+6k4wobWi7Qet3LDLAJ526y+ZpBnlFmIjXQvjVzSYffN DD15eSVuneMA+2Te6bJfJ84ZzyDqNwQ0vomTV6gqsMmtC3z2w+mQl/mLgyZrKjGM6nev 9yeD9RL3Gx6+XfEML3jgT1J95bq7/hGkGBY6Tm9hFDXGR7TcNUmDsTQaHmmIn6utH60X VmxlQ+fA8gLfR9MaSujF6MRK93p/05TtFHBZPYKUtJn6D1GbBW/QvmJG4yDqTB/skPGa texEeZ1LH40fFDNVuRHMi5zAVBcV/sHU77f7rHg/zvyJsOOjTlWiGMbvxSN2xNtAfRPM fvjA== 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=dMgwmasYvHgdOcKwMVP0jfub7m5Pk4kyzghJipcYrB8=; b=cTiEosg17c8/51tukcY7vRXahpgnXdJgugK7EKKdfyN/+yrYndRs5dn3Sy8GgG9St1 i3X1KNcUOORfXUuLCys4ZvzeW/LOT46OPAfFe0D5ZzZ12FAv7AyPjauYS5O6fUOq39BN AxT/WNFPujpRb19ii2YcIdMGff5YW7afknGR1MLNk7mVbb5XGcT+zU8wpr80Cd+vKm9M 7nrByE1SwDIsx2D6TUaKD7qPCBoOXw0qtx/H3a4pL8f+x2CGKnCXopmB5SD6lJwLu7Ks 8XKVI2MmLcR6sWnWjdCup5ntw0ozFcZ+rAxL0WTVPe2IvT4jCNM/eKZDxfMNspzu+qoq MeTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=J6bOPxJt; 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 kl20si748454ejc.775.2022.01.12.18.00.54; Wed, 12 Jan 2022 18:00:54 -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=J6bOPxJt; 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 055C068B0B0; Thu, 13 Jan 2022 03:52:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDC5168B094 for ; Thu, 13 Jan 2022 03:52:56 +0200 (EET) Received: by mail-qv1-f42.google.com with SMTP id kc16so5129226qvb.3 for ; Wed, 12 Jan 2022 17:52:56 -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=e9cKIiNl8zAxJ6jftWxk53Gi78T0sdSGyotrA3ndh5w=; b=J6bOPxJtRhbtcky3WezY6K/sSlmf6mxP7zZ2/vlnZWn4DfWH0+nbhiS2AZ/TlgT2zx +kZQhRPyBMNiPCPJqAhk66208cLwU7An6/ldYkNb1Gd0TribF7x+nDne5eSR4ljexl+s b32uIIZWewT/aASkODbIQEe5+h+o++9QDGFlBTrKyNNLHFAit8dpVq8Jr9V1V1+pv/Kl a7jB6Vs+HQJWaeAOs0tDvhBtTuiiTfzzyczB7gWex/ifxlJRpvzP/SX9o1JDCC2hDH2E 1q4vsu2++1Cipe3cPKouF/YAkBBfB9rTXRtnluO1aPpuN/bF1CV2zqCo4XOHJ/HJZXnv a4Mg== 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=e9cKIiNl8zAxJ6jftWxk53Gi78T0sdSGyotrA3ndh5w=; b=cb3SBdyJMWQSrgsUWlJllkVMgM4tdcwVAKWRA6dWFjwsN2i1kZRu6fvOmCUJ/QLOb2 gyxcZxM2/bRVfcHsojLJQKOwiJXd3QNStQ1bfccVzNOiSGUc1XLOmIkzMXjXxqffcB9Z wI70Ao+oK+w10i/ETTYLLl7bA4ikaYtR5lEtZ/VMmdosNNBLA+kI3AgvVjIIgEXtXqQZ bwibiBwZMzcjG+Q4Hk6lejb9wnTRrsqlBYVI351qNaecNmxSRlDn/iJ/XGw5S5WsgD9N Yi5d0qel0a61EUO/6dwM5v9WiQMowd9VG1m2ozKJb+e6zJ0w5elaHm2jBsKiZWMjy3OM HMng== X-Gm-Message-State: AOAM5309TcfF2wmwXaMxRtqnyHogRXGAONU/Mc3uRDQ4uobCTzMJm2mk 8xk4KCdnCqPEMDDQ7v8Q8DEsgZdH0TQ= X-Received: by 2002:ad4:4ea8:: with SMTP id ed8mr2448662qvb.52.1642038775469; Wed, 12 Jan 2022 17:52:55 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:55 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:08 -0300 Message-Id: <20220113015101.4-47-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 046/281] dcstr: 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: FUaB4EyWjqiV From: Anton Khirnov Signed-off-by: James Almer --- libavformat/dcstr.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavformat/dcstr.c b/libavformat/dcstr.c index 71dce08bf7..10f41ebf4e 100644 --- a/libavformat/dcstr.c +++ b/libavformat/dcstr.c @@ -41,7 +41,8 @@ static int dcstr_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - st->codecpar->channels = avio_rl32(s->pb); + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_rl32(s->pb); st->codecpar->sample_rate = avio_rl32(s->pb); if (st->codecpar->sample_rate <= 0) return AVERROR_INVALIDDATA; @@ -50,14 +51,16 @@ static int dcstr_read_header(AVFormatContext *s) avio_skip(s->pb, 4); st->duration = avio_rl32(s->pb); mult = avio_rl32(s->pb); - if (st->codecpar->channels <= 0 || mult <= 0 || mult > INT_MAX / st->codecpar->channels) { - av_log(s, AV_LOG_ERROR, "invalid number of channels %d x %d\n", st->codecpar->channels, mult); + if (st->codecpar->ch_layout.nb_channels <= 0 || mult <= 0 || + mult > INT_MAX / st->codecpar->ch_layout.nb_channels) { + av_log(s, AV_LOG_ERROR, "invalid number of channels %d x %d\n", + st->codecpar->ch_layout.nb_channels, mult); return AVERROR_INVALIDDATA; } - st->codecpar->channels *= mult; - if (!align || align > INT_MAX / st->codecpar->channels) + st->codecpar->ch_layout.nb_channels *= mult; + if (!align || align > INT_MAX / st->codecpar->ch_layout.nb_channels) return AVERROR_INVALIDDATA; - st->codecpar->block_align = align * st->codecpar->channels; + st->codecpar->block_align = align * st->codecpar->ch_layout.nb_channels; switch (codec) { case 4: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_AICA; break;