From patchwork Thu Jan 13 01:49:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33307 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp13980iog; Wed, 12 Jan 2022 17:55:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJxhD5KkPEZeaCIuoZUxzyj1iunY7uFkC046uwZJKofcz64SNUoUl/UuQD6w19nlss5J3EPc X-Received: by 2002:a17:906:c419:: with SMTP id u25mr1950994ejz.55.1642038923744; Wed, 12 Jan 2022 17:55:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642038923; cv=none; d=google.com; s=arc-20160816; b=r2P0t9nQfMod7l6vOEYx0JiVBtWEz0pMoRu9/yPj0c1uadTezFcDzWN9A5BGhqAGLm fl14HrlHiSWPcIltUxwaP3n00H1wk3LYXOfyL9Ih7Lq7Zq1nWh+y+Hju5D1Dtftm5Ivf KKgAVsV+WuBmTqfK9xX757QSd8W6KwrD+Bhr9UIrGZONJaCQFScosIsamXH8qXmejIQc HJBf++r9quG3jesL4+mjs5Zghw5W8gefxyHGAvYFiJ5iQ1EWFu+lUqXkw1YIqzGLFdoH zjq3leoEEGuJMkWSI7I5vo8/FJrJlPIE8SWT9z+A6uNKf4rs2dIuryMEslGs52J4285N ffww== 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=yyXzI7JQm6TgQotyiRuEQ9p3UlVeSCcCZtXBzUBFZYg=; b=Btpqn21k1q432RsD+GafMQmB0VVJlSDIM6yAVAnClDY0YB+qzcTPhR2JO9TeHGarOQ Lfw2CvcFBmBadc+J4VCoLHievB0B5s3sJXwWwLAxizwGSAXxT8GfcHnc0H5Kekwp4itk 9jNOSYbvrbgmlpKIcrFjayhsaroT0X9dvE3IffGe4LoB1i7dg6T14fOvDcN6TZjKIUCr gmPjqwjW+a2076TizH7P1t5kiaX/RN+WWkdWAjzL7UOzrv0SZuGbGkIm6Guwk/qmU2D4 r0YXDl84hPQeX3BnFKPJrbOqOqUJrGSId5kYieF3Jxk6hn4If2zLup7xeA2rXjjSYxTR 64UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=lh1DfLnI; 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 nd41si781054ejc.477.2022.01.12.17.55.23; Wed, 12 Jan 2022 17:55:23 -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=lh1DfLnI; 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 30AFE68AFCD; Thu, 13 Jan 2022 03:52:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0899768AFA3 for ; Thu, 13 Jan 2022 03:52:21 +0200 (EET) Received: by mail-qv1-f49.google.com with SMTP id q4so5080585qvh.9 for ; Wed, 12 Jan 2022 17:52:21 -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=FbuyZVzcwKBdj+d55zsoEzEimxIqw0PcLF6MP4+XGZ8=; b=lh1DfLnIWHMTdi4PucsUYBte28blDQTdWV5iBdHlrUZmGsIM8Q3iooAaQEtfRTLzR0 WajizTuIxfVWkGbbLIC15KccheFKzKIv9NZo9nKXt0a3GrFGWcWMpZ/LN5WzKYsPBgtl P4WyKbuawrDjV3qFm2uKUOJTeKFhsYc3m0NsQtbi0Ypn5k+vrUphkXbjePWbZHnmIgNq jwdL2rI0yAykjpoib2HMWR+CYfz1kcR/Df+56qYs7LnG/QV3dP+d4bWhcr0/MwWDHcKD C24yWrZhMfVryzNMhUCadABvFvGB/ODU6OVzRS3gliE6HXDRCP6vbDhTpbfPKh1SKroB K1EA== 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=FbuyZVzcwKBdj+d55zsoEzEimxIqw0PcLF6MP4+XGZ8=; b=Gw30LG+kLKaOqC+hRzYQ6Larrh2lUEaC/puk4fwNaUmI3KgERIYVS7UkOcZZ9g1Szz wjS6AENA1e4YQCfnzeNthBzmFPRE/XCQlyCVIvX73pjgiE0uYnph+2IGGXRJeIuaGvhg tvylXw9Inp9IFZkQ/cjAjvuy1rK3dt+6RiOhV5r18xTLeoKR05y6Fs/yQDWUiG+2LcG8 85Q5omZ3P7xQ6Tr0kBVtm446mZLJhNbeYBeMU8gsNRwTmj182rRbiXd0wPxZdaKcgjDR YMDGwPQ0yPBUmA2XmqH+JuzNH9JqwGOv5qiyI290tvM8dNN/Zaez2Oh4q76TFWHUiINx 1RIw== X-Gm-Message-State: AOAM533pN4TmvVoN1yuRfWncHvhh3WDgtxbuFEP/STvGC1HsyaRFTfNf LNtviTOKNG7kPjXL+eiNCEdSLwNoWUw= X-Received: by 2002:a05:6214:2588:: with SMTP id fq8mr497037qvb.111.1642038740349; Wed, 12 Jan 2022 17:52:20 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:20 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:39 -0300 Message-Id: <20220113015101.4-18-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 017/281] ads: 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: Jo3broGgpZTP From: Anton Khirnov Signed-off-by: James Almer --- libavformat/ads.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/ads.c b/libavformat/ads.c index e7b419ce8d..ee329bb403 100644 --- a/libavformat/ads.c +++ b/libavformat/ads.c @@ -48,11 +48,12 @@ static int ads_read_header(AVFormatContext *s) st->codecpar->sample_rate = avio_rl32(s->pb); if (st->codecpar->sample_rate <= 0) return AVERROR_INVALIDDATA; - st->codecpar->channels = avio_rl32(s->pb); - if (st->codecpar->channels <= 0) + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_rl32(s->pb); + if (st->codecpar->ch_layout.nb_channels <= 0) return AVERROR_INVALIDDATA; align = avio_rl32(s->pb); - if (align <= 0 || align > INT_MAX / st->codecpar->channels) + if (align <= 0 || align > INT_MAX / st->codecpar->ch_layout.nb_channels) return AVERROR_INVALIDDATA; if (codec == 1) @@ -60,11 +61,11 @@ static int ads_read_header(AVFormatContext *s) else st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; - st->codecpar->block_align = st->codecpar->channels * align; + st->codecpar->block_align = st->codecpar->ch_layout.nb_channels * align; avio_skip(s->pb, 12); size = avio_rl32(s->pb); if (st->codecpar->codec_id == AV_CODEC_ID_ADPCM_PSX && size >= 0x40) - st->duration = (size - 0x40) / 16 / st->codecpar->channels * 28; + st->duration = (size - 0x40) / 16 / st->codecpar->ch_layout.nb_channels * 28; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); return 0;