From patchwork Thu Jan 13 01:49:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33314 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp14692iog; Wed, 12 Jan 2022 17:56:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJwibd+zmsvlot4RqHbHDqw7OmXT25/E06EZU/I4lo8R+ML126E2eb3kK+wAwDNGuAwdRykQ X-Received: by 2002:a17:907:7ea6:: with SMTP id qb38mr1846652ejc.557.1642039004037; Wed, 12 Jan 2022 17:56:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039004; cv=none; d=google.com; s=arc-20160816; b=uISMu5/pDcMhnDjccL6UInLdMZoyWjyYv5ACcrTW3WjNWHGUSsX6Dt6MDMB/0z0LrC SGu0avi+3O60v6Y214Iwha67wgKjek905Tkjp598GIIJChBkUCDYx4Y8ntREegUj3+cg SqwRRcXGa5ktcgscH66lhGsaW2QkYBLvEiasc0N8mQ626aPAVUBkUq8jI7C2kN9q2u0y dkdUud8M30xJJLhEump39az2mofu9tcSKZKkqTsGOvlSKFWmV1vyzkmD50Nzc8Rud2Rt Hoj1E0Jigek/7GH244mrI4Ngvea0ezzIGMyT3Yhi9UsvmDDN5iybZ/YmlrtAyOVIWpp3 xJkg== 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=dEQzviT1b+1wkQgZDr2TTzQ6/hi1OV6aUoA9nPsY6J8=; b=k3L5eMXb/Ws6DPV57RnGkEwgKi3fYTJd0a5DA2xNGdcS8pCoz03QyYEN6l5CxZNKLT +cBDRxY9CdiZxZrSJwZIj+UaGJP7Rgw6Q396AQPyEhLtSyefWVWtmBeQF8W5t27ds/da Ccexs5ZqQcejRoW7UpnhdpOByL0VfvnJGEQL2/O4kBgvrDiKe2j70QwxiEPQtWDGXBzg qPCzqq0bx7Moufjml9IXxs7mu7VgHdej/+hZ97KRAC/FfYtKTup9eIZgZIzEvOr4kEB1 K+4X3aUfxNJGaIFU7lYgEOiCjQjYHIFMpa1Zx+kNek3JYRS4hXk1mX+h0TvA1s5zoBPy qraQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=m8RifiGY; 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 a15si827861edn.5.2022.01.12.17.56.43; Wed, 12 Jan 2022 17:56:44 -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=m8RifiGY; 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 75E9F68AFED; Thu, 13 Jan 2022 03:52:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4890E68AFF6 for ; Thu, 13 Jan 2022 03:52:30 +0200 (EET) Received: by mail-qt1-f181.google.com with SMTP id y10so5359785qtw.1 for ; Wed, 12 Jan 2022 17:52:30 -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=Fp1cGno7wqoZbBS9EVfHpeHDvVHojGsWxlaz6kSjSx4=; b=m8RifiGYlmcoGa4x/DtK0QkPgXIXwL4CEXQGwRZv5+rD+SCYPlpIfS9izaWkbOXsca xMZGILPq8MTmeo65xkzULMkv6ZrQtOfzvTY53dcQODUmyPk/KL5k85Il2sOSrctZ0DPQ 8oj883C9ujdBg2tiZ4Hwc5yTtM5WvVTVlk5NIVdUsnuLLMwGbIfZOOTokjzc8WxXIG3Y cZrxWzTdxzO6QMviiY1SeA1x5QQalD0OlMGJPPNzNZJTDB2yKEsdZqZoY89prOEGOkqd OWHIOnr47n6fqkZqWo+59oQgpDCXR6cTdppeWlUMZtBp5TWJh1yXS5OszR+hKtoTb7J4 mY+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=Fp1cGno7wqoZbBS9EVfHpeHDvVHojGsWxlaz6kSjSx4=; b=2hG8nX7Vo/Ov2kmIOQcac4om2Lh+tIRU/gVVhTa+Ya0FP5w2teJ9S2/SUqQ1JfIkn3 LO12IY+CBMBj9Bq/nLYEaAHZIkTh6Mu9qoHM/lGY01Q3hQPlrGiDtcDH6DLTGgCkwEeT pU3sU+gnNf6DQnQU8JCty6QoET226PzsAvcktgN0btEFuqVtV4s6Rq3DfT5PtVtEW2K9 1uzVSSblKRtKRPz4c7n9jfLrfU2vFwFg4g0jnxvpfKrX8i1+rs/Mnfm+bDdf/QeQvhVB 2UEn412yRsE+2gDH8ctpFnyR1ZTfZFWDykf6PGQFf3hEAYg4hA6hM7Xckgw2ghC2ovjZ crjQ== X-Gm-Message-State: AOAM531oUnIZwWJ0dBchF/VW/BivxxxIR8QDNCm+BBuIye6Fyeb11g2Q txThwzo/grFL+571xoJUGdZ/4Q+S7oY= X-Received: by 2002:a05:622a:1045:: with SMTP id f5mr1230011qte.36.1642038748897; Wed, 12 Jan 2022 17:52:28 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:28 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:46 -0300 Message-Id: <20220113015101.4-25-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 024/281] alp: 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: a5wasubhNZtv Signed-off-by: James Almer --- libavformat/alp.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libavformat/alp.c b/libavformat/alp.c index f46bdb4511..444b55dd77 100644 --- a/libavformat/alp.c +++ b/libavformat/alp.c @@ -119,18 +119,14 @@ static int alp_read_header(AVFormatContext *s) par->codec_id = AV_CODEC_ID_ADPCM_IMA_ALP; par->format = AV_SAMPLE_FMT_S16; par->sample_rate = hdr->sample_rate; - par->channels = hdr->num_channels; - if (hdr->num_channels == 1) - par->channel_layout = AV_CH_LAYOUT_MONO; - else if (hdr->num_channels == 2) - par->channel_layout = AV_CH_LAYOUT_STEREO; - else + if (hdr->num_channels > 2) return AVERROR_INVALIDDATA; + av_channel_layout_default(&par->ch_layout, hdr->num_channels); par->bits_per_coded_sample = 4; par->block_align = 1; - par->bit_rate = par->channels * + par->bit_rate = par->ch_layout.nb_channels * par->sample_rate * par->bits_per_coded_sample; @@ -148,7 +144,7 @@ static int alp_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->flags &= ~AV_PKT_FLAG_CORRUPT; pkt->stream_index = 0; - pkt->duration = ret * 2 / par->channels; + pkt->duration = ret * 2 / par->ch_layout.nb_channels; return 0; } @@ -202,7 +198,7 @@ static int alp_write_init(AVFormatContext *s) return AVERROR(EINVAL); } - if (par->channels > 2) { + if (par->ch_layout.nb_channels > 2) { av_log(s, AV_LOG_ERROR, "A maximum of 2 channels are supported\n"); return AVERROR(EINVAL); } @@ -228,7 +224,7 @@ static int alp_write_header(AVFormatContext *s) avio_wl32(s->pb, alp->type == ALP_TYPE_PCM ? 12 : 8); avio_write(s->pb, "ADPCM", 6); avio_w8(s->pb, 0); - avio_w8(s->pb, par->channels); + avio_w8(s->pb, par->ch_layout.nb_channels); if (alp->type == ALP_TYPE_PCM) avio_wl32(s->pb, par->sample_rate);