From patchwork Thu Jan 13 01:50:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33360 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp22638iog; Wed, 12 Jan 2022 18:08:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwCMBNEKyzPsYAuj8da22CHHTU++JVTD920Br77lJVmsg0mHdF7aSEWbvWe1AmHXrSH5GCm X-Received: by 2002:a05:6402:649:: with SMTP id u9mr1624563edx.325.1642039707183; Wed, 12 Jan 2022 18:08:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039707; cv=none; d=google.com; s=arc-20160816; b=qy7tZRe3FBZ1FMn5cy4bo53YTTQafABp0SiswVICWX5HXfcbIKovUz3SzDD3ORt1u3 kG3ymJYmrhtkPvDMNlCXqtkqNmqsByF76CK0UGFQfbXBzqUaqlKyWQO2S1T5snOa/4FN 3cx7Bk3x+w4zAME5In8DBBysA1VC3rJBHpzs9N5JgAdaxlTCSLEtRZ/2/OygnDeh2Hjz iGU078GaKWAh+sdAvt8iLrnnkyEbdiPIexZyN50DJkpzAaIbXHQd8nzsSMIebTTf1SAc zi30dKuA530FyvMJtqd0j09iURlMCIE1HHtdABPy3p+uR5CxI2vl6luaVpaN2zKBCcLj WdNA== 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=57+LpvSSCqkf1u2o17pSVZCeostyBIjn/246bu2yPBQ=; b=ZpAfh04TkMR+J7/HdlHdxiy8/Lvsy2v7huGUjbEi4849NSpYPoW4ImxcVNWO9Z65at Xcr3iFDMgA/11TU84dPu1zxTmASaM/xSbFXBCpPdI7Vrhdlyz93S6Oa9NUiV0IFh2nOk csGWyEDyDeh0Pb+13vG5LyyhLlgEVnmO91KqvFFUvSFtP++DobhDw/NrfbUM361d9vye 9VmmVwlmGx39nN7pdcYVMNFxukMfg6Ak6WEGGatN4727AAyZp1ltNs0RPd55WLxeHX3y 1hA/F1sqFj+J5TFMDQkjhjFPHywy9tnEh1JXj0uWVxQIUB4ICPJjqqbLKF2PDFETpCco QoJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=gh8abDNF; 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 p7si800156edi.14.2022.01.12.18.08.26; Wed, 12 Jan 2022 18:08:27 -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=gh8abDNF; 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 0426268B1D9; Thu, 13 Jan 2022 03:53:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9919C68B1B4 for ; Thu, 13 Jan 2022 03:53:33 +0200 (EET) Received: by mail-qk1-f179.google.com with SMTP id t66so5561086qkb.4 for ; Wed, 12 Jan 2022 17:53:33 -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=VFq42Q7okdajDuusBz5Nn5QwXoWYpYv7evLK1dMeAYY=; b=gh8abDNFA9Cy2c+PRh3URyV6CC9PSbmQHrGZse/PwocIuLqXsNUYsscZteKUznzPol UDDRTZO91H0Tfe3tD+KwSzEFarmaZez16ByFc0dx5HGhGm2OcLc04Hsq7Q7yCd6rxm6X ogObeMBb3hOY6m7kujqi9CKBxzlHPd9YUD8KhQqrSIYioHmfJLzP1N4xpr4Elm9U6crB RmZKAljqWqTnTPMGn2EfcfG9+WD7yUuHt4ycheKHiLsWz/LsqNtUnOzYDg8mGo1pBt6E PnryeqHQPKgcNXHOkwQ/damLEry94ar9nG7hojGZ0zDneu9LNCjni/Jj2DnCq8QNaaGm aing== 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=VFq42Q7okdajDuusBz5Nn5QwXoWYpYv7evLK1dMeAYY=; b=nnVS/yC6QfmVc99xesHDCwlzPuXNu30T0WL1UCN/16Sl2IoP9/hQjzD5JDXLQ2FFhl 7+9Jy/VmOLcGvWkcek1ltwRN2gTh6U4JlmXNUmGnR3QYbddRNyVagx1ob7CwCriLZ4Ut YVyXCznM9XamSzQi7wkgfZm+QQ2mqtatVXRMzXwxTzzvivqyKjNYi2zun2y91oLyzq0U fAmCDHhYyVP7dd7X40cbmnAIxCvJLH6GsATSXtXKksdb2vQ5zemMZ/ahlvc3NdqKxxM8 kln46SyXAVsqZ/yHYKxLuMh0l7LqQXltZTTgfwz2y0vSxlTBF9t5F1/enkblIItMZgl5 +k+g== X-Gm-Message-State: AOAM53134zL3mMrFBJZwuYqUO1/uwi/UPlReMZYeFGbZO1vlyG4V0xQf Ty+q4Cd9v+Zvlal9XvX/P0ZlhnzAtgc= X-Received: by 2002:a05:620a:38a:: with SMTP id q10mr1846941qkm.429.1642038811931; Wed, 12 Jan 2022 17:53:31 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:31 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:38 -0300 Message-Id: <20220113015101.4-77-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 076/281] idroq: 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: ZFOlGlwt0HdW From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/idroqdec.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavformat/idroqdec.c b/libavformat/idroqdec.c index 0c8b7278e9..c9fc972780 100644 --- a/libavformat/idroqdec.c +++ b/libavformat/idroqdec.c @@ -185,18 +185,16 @@ static int roq_read_packet(AVFormatContext *s, st->codecpar->codec_id = AV_CODEC_ID_ROQ_DPCM; st->codecpar->codec_tag = 0; /* no tag */ if (chunk_type == RoQ_SOUND_STEREO) { - st->codecpar->channels = 2; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; } else { - st->codecpar->channels = 1; - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; } - roq->audio_channels = st->codecpar->channels; + roq->audio_channels = st->codecpar->ch_layout.nb_channels; st->codecpar->sample_rate = RoQ_AUDIO_SAMPLE_RATE; st->codecpar->bits_per_coded_sample = 16; - st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * + st->codecpar->bit_rate = roq->audio_channels * st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample; - st->codecpar->block_align = st->codecpar->channels * st->codecpar->bits_per_coded_sample; + st->codecpar->block_align = roq->audio_channels * st->codecpar->bits_per_coded_sample; } case RoQ_QUAD_VQ: if (chunk_type == RoQ_QUAD_VQ) {