From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1FF5642E32 for ; Thu, 13 Jan 2022 02:28:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B1AD968B4E3; Thu, 13 Jan 2022 04:01:26 +0200 (EET) 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-Google-Smtp-Source: ABdhPJxvyk8YWH33Us9puDiNuUjSv++DZILnHyhSNmtQNgK77Gtl5TVe0dkisXjEI02NHgTydHfW3Q== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".