From patchwork Thu Jan 13 01:49:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33322 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp15596iog; Wed, 12 Jan 2022 17:58:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJzbvguGfuzHTyI/GGgvTpRrj+Q1qguYD/3/iaT244nszlzrgahdF0Yvmt9IoXF5ZX3+EtUF X-Received: by 2002:a05:6402:3514:: with SMTP id b20mr2292975edd.178.1642039109529; Wed, 12 Jan 2022 17:58:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039109; cv=none; d=google.com; s=arc-20160816; b=A5s6G1SCDYKSx9lsf2IQ4kUWQ1/3R7X6IPL2iseU6vCzYR5S1vgHdLeH3L29MOCedb tJmCiHPbaSFXazvWYHA2NXPVj8JpvYx5QZzAWKeTl0ASQP6Ur7LuUxj0J4W2Im7zwuxp XrksIKhJOLw6osdvKJPdMUbbikcWbET1J1tghgaFs5XLP2IcSgqfDXSMag+EevJLfeYV SfC6Np4j9oqbB+vF8ZeVBhTlJ6Xi78Abo68trsXg8eWbcgmwDMU5PtXC/a26v0ohzRms aBxZ84o6HohzN5jvZov48/CDLxHLqxXRuoZQytNYNLr5592w0xaVRNwii/mffD42LSOF GBLQ== 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=UrUcZ+SelxgASnCmXTX1qUXzN74iWNXCbBgP/KLuYzA=; b=Hm+EySggDSrMWsAj2iPedfmjZt1cXCOhvTUH8ITuBgykxPMF9Ueft25yMeLoHm3/LX 2Hi1pegwOngfp/hXPuT8yP0QYmstKj5xGs5NoV/o7F+vOJRHmv1/q+UI3XZcjkh234dJ ickO/nYiyOU2ivNQE87m5NWw2lYXzEGqej+H9D3BuVptS0HYOQTwHEGUjMfkkhPN3B2n XFdxV60TKCr/+Qfsmh7HxR2c+FTAuCyeKLfw63kEFN+we47vlVgyl79+ZvsyuWnXN2X8 TuPGv6kiXzMk5jlRf6BbnZrm06SbAtj+FJdJ4lCrzK1L7X64mOBOMAWq6G432tO8DcSw ncwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=YaKQRSdY; 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 hv15si202537ejc.869.2022.01.12.17.58.29; Wed, 12 Jan 2022 17:58:29 -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=YaKQRSdY; 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 481E268B042; Thu, 13 Jan 2022 03:52:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0E10A68AF88 for ; Thu, 13 Jan 2022 03:52:39 +0200 (EET) Received: by mail-qv1-f53.google.com with SMTP id r6so5032270qvr.13 for ; Wed, 12 Jan 2022 17:52:39 -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=N1PGC4qDH3pLDaCsmPrghuHbgoB43kijpNcMMPRzyjc=; b=YaKQRSdYmSiRjd9yygxK+TsCLImuKExwla3BblO0AbFc7vkX3emOw/tv9XoRDZk1Fa KhfYyaI57baOghdfot9u2KjLRYvmrwepb9dPVtChyV4ZLAyJXCYeamwBfvPxpJhFsyBS aveQ4yvEbgFu76RtDuYN/ylZOwMAOnrCDSv7A2MYNLbY9y9ag1QyjwbGouZSsiSizshl AonUhKWyRj0KxzPOE7S24OEd4F/b8tZWyZ0XGOeyAZySHRRN034m4T7re1wjEfN41SWK wyJev3gJV4MHsNOy/QQd6skG+mXMFGYfNNqY1jpPoIUnbRjj21mQPB+nYyXyXdnX/m+P VK+Q== 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=N1PGC4qDH3pLDaCsmPrghuHbgoB43kijpNcMMPRzyjc=; b=KmF65CG/MzVhM2lUdruvddJj0ayyJ/F+5ODX9gsDMWr1nMteB++J9QfB8FTaRQBM/y Gk7WNhAPmYxijqV9FW/RMdbAD5XPviVMUJsEK5FjbSpqOmvoGC/v9sX6PSQmbNj36z3A DsVhbd8SR/RXoG6oPnpgwq4Kk77zvveamzyBo0yXfSVy4fZQ0fXJoqiPqOm2dk3+yI2t 64p7mb4NkgY3DJPErJz7V6ZAjGMS8dD3Jo9coLtikd+2/xGsi/B02Evpjvu5+gIVztts gHUwElnqCt19vUHCEFTzGRS/SquAT/Pju4CzqNI3EihpXYBrAgq+zcm88OVzQkczEuDa nKSQ== X-Gm-Message-State: AOAM532q5DpvLgiZpM2iaKal0YBCCsJJHxn1A656HQhh9VMzhy6ckQmc tIHmzbmlqcNKNn2scu91KTZ8ekjP9aM= X-Received: by 2002:ad4:5967:: with SMTP id eq7mr782818qvb.106.1642038758630; Wed, 12 Jan 2022 17:52:38 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:38 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:54 -0300 Message-Id: <20220113015101.4-33-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 032/281] ast: 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: pkW2MYBtJqoW From: Anton Khirnov Signed-off-by: James Almer --- libavformat/astdec.c | 18 ++++++++++-------- libavformat/astenc.c | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/libavformat/astdec.c b/libavformat/astdec.c index 629372acf1..3d460ce827 100644 --- a/libavformat/astdec.c +++ b/libavformat/astdec.c @@ -57,14 +57,15 @@ static int ast_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } - st->codecpar->channels = avio_rb16(s->pb); - if (!st->codecpar->channels) + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_rb16(s->pb); + if (!st->codecpar->ch_layout.nb_channels) return AVERROR_INVALIDDATA; - if (st->codecpar->channels == 2) - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; - else if (st->codecpar->channels == 4) - st->codecpar->channel_layout = AV_CH_LAYOUT_4POINT0; + if (st->codecpar->ch_layout.nb_channels == 2) + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; + else if (st->codecpar->ch_layout.nb_channels == 4) + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_4POINT0; avio_skip(s->pb, 2); st->codecpar->sample_rate = avio_rb32(s->pb); @@ -90,10 +91,11 @@ static int ast_read_packet(AVFormatContext *s, AVPacket *pkt) pos = avio_tell(s->pb); type = avio_rl32(s->pb); size = avio_rb32(s->pb); - if (!s->streams[0]->codecpar->channels || size > INT_MAX / s->streams[0]->codecpar->channels) + if (!s->streams[0]->codecpar->ch_layout.nb_channels || + size > INT_MAX / s->streams[0]->codecpar->ch_layout.nb_channels) return AVERROR_INVALIDDATA; - size *= s->streams[0]->codecpar->channels; + size *= s->streams[0]->codecpar->ch_layout.nb_channels; if ((ret = avio_skip(s->pb, 24)) < 0) // padding return ret; diff --git a/libavformat/astenc.c b/libavformat/astenc.c index a5792e0b07..b29cfc4aaf 100644 --- a/libavformat/astenc.c +++ b/libavformat/astenc.c @@ -84,7 +84,7 @@ static int ast_write_header(AVFormatContext *s) avio_wb32(pb, 0); /* File size minus header */ avio_wb16(pb, codec_tag); avio_wb16(pb, 16); /* Bit depth */ - avio_wb16(pb, par->channels); + avio_wb16(pb, par->ch_layout.nb_channels); avio_wb16(pb, 0); /* Loop flag */ avio_wb32(pb, par->sample_rate); @@ -109,7 +109,7 @@ static int ast_write_packet(AVFormatContext *s, AVPacket *pkt) AVIOContext *pb = s->pb; ASTMuxContext *ast = s->priv_data; AVCodecParameters *par = s->streams[0]->codecpar; - int size = pkt->size / par->channels; + int size = pkt->size / par->ch_layout.nb_channels; if (s->streams[0]->nb_frames == 0) ast->fbs = size;