From patchwork Thu Jan 13 02:00:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33442 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp34678iog; Wed, 12 Jan 2022 18:28:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJyH4cMFt493mJqt5WDRqeCLwBefirunF8dfP7Abk6iE0VwCs/xXPMwAiSOztXEoUmSbM1A0 X-Received: by 2002:aa7:d29a:: with SMTP id w26mr2334312edq.207.1642040919964; Wed, 12 Jan 2022 18:28:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040919; cv=none; d=google.com; s=arc-20160816; b=upAeMIwIjQOYLZCI5Em1F0mIphYO7A2FOMwZ7jcqrIJ2l6AWmz56ZJiwVaJoEQoZZ6 fiPNCVxvMuBJ1fCliH5QABYRhuoYT69XZnQ18uRunsezMfgcsvY5hSSGbGn77pPl+9EH 83kzF7mAAk5B+il0P70WHDoHy5FGt8ica/TIwas3doYLU0uVwUJz8aojTGs4txfBUAzO PnYpe0pVZZOw6FteM9UbS5y63VJ9OhXGKM8HoRk7I2jlJsME8oy1PTcrRsDVmwHORGy/ 0Gih4TNmmf6RXZmGo2FMPB3tKMZP0n78uPxiPAOMbOjL/Xse/pzusvZdj3QDZKvqVF+A DsnA== 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=ok20/s52Yu7YrjGNujd9WpeJ8Wq+LN2H9ckP33CkvGI=; b=fyfrwSP8qycFjEyiiiAxi8NK86h4gnJ41pdTwi2VZgD8dkj/R9hQWcGFtW+rbF3SqQ 4VmHqEU1dXvM0oeo2G13d5iCb7lvJVz18CaSWyxSDZXguJAECnepY2e0pQWdf2H3r2Hv Fjc9TKVBg20i97oZG8JtlFoi/qtGLce/M1XN+1gIi3t0MAXPxSK02O34aUhJUQ2qOsuD 3eVzMsl9XDjgSY2I4Bzjnwn86Hn6eGimYdAGyKYpAKFVAJ4r8Z6brfvsWFHlaeWhUc9b VmJQtogXHHLoeKymu0hMhOkWeac+b6P3CPn6UFyfcBSOgaR1TRksBs3uBQW9UI8VL9ZM VaAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XW9WMVXg; 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 du16si948003ejc.530.2022.01.12.18.28.39; Wed, 12 Jan 2022 18:28:39 -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=XW9WMVXg; 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 D892768B4DF; Thu, 13 Jan 2022 04:01:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 861EC68B4C3 for ; Thu, 13 Jan 2022 04:01:23 +0200 (EET) Received: by mail-qv1-f47.google.com with SMTP id a8so5164261qvx.2 for ; Wed, 12 Jan 2022 18:01:23 -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=62nBBk67xVuf7NPHAUV/S7tNRxbUbZPAyBMG/0G+uIU=; b=XW9WMVXg6MIzFb6yG3AJbuEEpxKOKP78K6Bf0d/JiiYUL5ydhTTQ5K0geWzKSXCnOj MGHFXmcTRQC1Q0pnvRa8gKplndSR+Gv+prb3nQPuS8gMEuGaPAacIsTm2GV+eaMIo1Nd as5bGC9Zo4gsnwCr1FIcSxLRQBdtUF0vG1UpPFA9rUUmnHh3EELMAg/cHy7DgTLX8nVM lwffv5YWfP+u2zeba82ETEbs89DxzouNd/1ubXYM55TEDd0idVss13e62y5++TWI1Olz 7ZcwFuArwizky0kgf/wLiGNat3zgiu9dquq9BwEH4JZcgr1anIwOcO3DzbS2/7UKe93Q UCzQ== 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=62nBBk67xVuf7NPHAUV/S7tNRxbUbZPAyBMG/0G+uIU=; b=uJpks1c8ODr9oA2BNTZyor+cqE0wLuPTjEZ+P/1QgZXYwrSMZb8TZVyAPoBqJyNAQ1 rfAR6kgtTvKt8+EkHJ/Uv7DYUw8aGd0nALcGntHPxuLPpBEK3uRCiiIdcuogq8U6ShRC na/8aUNm2fNmcIYIM030XxE4a4w5zIEEf9GxpD/ErMwa+vX3SgTrnH9rgGBC8/9/P+AD 1WTKhCxTNVrcDEPcwJCiC9WbhdmakUBESggug1oNpzSLJFoN5UEiZp9urZzCS6iCzVY9 AordHGG35zY9POHuJjl7sIqQH44QUPwkjNwwl0wUxCzPMsaUp+YVwFKzWyUBBKAv4JsI hnzw== X-Gm-Message-State: AOAM533ueLQuEMgqeMctmVnDXfxy+1YW5uXe/SeG2uQ5lFSnrvc17ulL EtbMVSWGb8NnA0zZh0V3Cv9oD9BLtu8= X-Received: by 2002:ad4:5de9:: with SMTP id jn9mr2087141qvb.87.1642039281940; Wed, 12 Jan 2022 18:01:21 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:21 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:11 -0300 Message-Id: <20220113020026.590-16-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 164/281] voc: 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: s4rj1his+X1G From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavformat/voc_packet.c | 9 ++++++--- libavformat/vocenc.c | 9 +++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libavformat/voc_packet.c b/libavformat/voc_packet.c index e5ae0be1de..a7ce2707a0 100644 --- a/libavformat/voc_packet.c +++ b/libavformat/voc_packet.c @@ -72,7 +72,8 @@ ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) if (sample_rate) par->sample_rate = sample_rate; avpriv_set_pts_info(st, 64, 1, par->sample_rate); - par->channels = channels; + par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + par->ch_layout.nb_channels = channels; par->bits_per_coded_sample = av_get_bits_per_sample(par->codec_id); } else avio_skip(pb, 1); @@ -103,7 +104,9 @@ ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) par->sample_rate = avio_rl32(pb); avpriv_set_pts_info(st, 64, 1, par->sample_rate); par->bits_per_coded_sample = avio_r8(pb); - par->channels = avio_r8(pb); + channels = avio_r8(pb); + par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + par->ch_layout.nb_channels = channels; } else avio_skip(pb, 6); tmp_codec = avio_rl16(pb); @@ -140,7 +143,7 @@ ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) } } - par->bit_rate = (int64_t)par->sample_rate * par->channels * par->bits_per_coded_sample; + par->bit_rate = (int64_t)par->sample_rate * par->ch_layout.nb_channels * par->bits_per_coded_sample; if (max_size <= 0) max_size = 2048; diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c index 798b463a82..59c2bbba7b 100644 --- a/libavformat/vocenc.c +++ b/libavformat/vocenc.c @@ -63,16 +63,17 @@ static int voc_write_packet(AVFormatContext *s, AVPacket *pkt) avio_wl24(pb, pkt->size + 12); avio_wl32(pb, par->sample_rate); avio_w8(pb, par->bits_per_coded_sample); - avio_w8(pb, par->channels); + avio_w8(pb, par->ch_layout.nb_channels); avio_wl16(pb, par->codec_tag); avio_wl32(pb, 0); } else { - if (s->streams[0]->codecpar->channels > 1) { + if (s->streams[0]->codecpar->ch_layout.nb_channels > 1) { avio_w8(pb, VOC_TYPE_EXTENDED); avio_wl24(pb, 4); - avio_wl16(pb, 65536-(256000000 + par->sample_rate*par->channels/2)/(par->sample_rate*par->channels)); + avio_wl16(pb, 65536 - (256000000 + par->sample_rate * par->ch_layout.nb_channels / 2) / + (par->sample_rate * par->ch_layout.nb_channels)); avio_w8(pb, par->codec_tag); - avio_w8(pb, par->channels - 1); + avio_w8(pb, par->ch_layout.nb_channels - 1); } avio_w8(pb, VOC_TYPE_VOICE_DATA); avio_wl24(pb, pkt->size + 2);