From patchwork Thu Jan 13 01:56:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33396 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp28383iog; Wed, 12 Jan 2022 18:17:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJx5NyAeqvLdV0A08nGEe2NMSPlmMnZWIdwf6zgCkGP98/ycNOzS032E9acUkZpts9sO71j+ X-Received: by 2002:a50:f0da:: with SMTP id a26mr2304642edm.37.1642040245076; Wed, 12 Jan 2022 18:17:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040245; cv=none; d=google.com; s=arc-20160816; b=WLP8H+KlpfdiZ7Hz4/ImYh9sF38j33/LcmxlFE4yA1AbDA1apBnVWLHXG91Z1xWZgZ gKvfZsdnGjmJWLaunfMC6Enf0u7idI4s8lA+F/AFe1itexUgjIgJF3FCp52MbXJYLk3Z pn00TQG18fQTrIe2eQDl+MJYAcZ3he8Z3MKE2r/dGkIH5elFlUKoZUcNl+PgGsEOds7r pVr5fB/6k00kvm7IY0WyjJDMRG62lZ2BLZJWrj1NxmsQmPPheCT+AMLS3a1kDp8fBnts VuUzJCTjXTBf9QrDrgRixKmnvwixu0uCKXgFRDkQCgvPvMSQgIwVZ421wIZoJNi1ZDvU r8sQ== 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=Ta0UpLkgG8IJx/b9JGCBfLyAHdet1UOhTdsmGpH9fy0=; b=KO2wpVCvzU1GaLTK2E2zJIdQfnDB3BhmTqGVWne30vDfnLjZ2aH7uOBxrgu8SUwCtP 5IxyTV7+rHauRY2xIM+BerUp6mIHKq4Gl0kYtVg6hkipQhtBWmOClGF6Wb+rZdyOy1OP 2MAF5YEaYH/klthGtrOIqxs/T6aHpQ33PpPtKb6d3bnXIIpEIYWIrn0rLy7ZjFi92iuL gAUV0Kf9DsgJ1xXMsKLRbXfWtwU0C6C15eZ5ZhOwr5h1IqJMTr7DIFm+usnP982du+Zp 3QhF46Im3iIHePw43BfJ7QFMHp7e+UY1HP80GmBtFqZTLK5NZlystFl7lH9io4oA3jt4 3y4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QcS7m6jg; 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 g4si896033ejt.430.2022.01.12.18.17.24; Wed, 12 Jan 2022 18:17:25 -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=QcS7m6jg; 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 E475568B314; Thu, 13 Jan 2022 03:57:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C98D68B2FC for ; Thu, 13 Jan 2022 03:57:00 +0200 (EET) Received: by mail-qk1-f178.google.com with SMTP id bl18so5569805qkb.5 for ; Wed, 12 Jan 2022 17:57:00 -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=mo7IlxycdUcsXlVAAWyr5S1jTS6gZDKLQX9efrDt4y4=; b=QcS7m6jgd+rvxgMkIrsvPGLCZuClRbPfxG8M0B1P+dO8E+nmZNfVqChcQfOOfuWI6c YfD1+n3VyjDA5qCdJYTCnrEeLqCqkLpIarAvpbS7QSdNSSLGKmvkKOlw6anQF78AVVYq Qm7sVqixZDh20AVNY3ayPIu5Q+ToxLv81nBeDHHFTrq4czz/kjtb8HERlPe0p1BnMnDl PHO4X+4+JxwNIexguHxiVkgnBUlDsJqR9tuPQemwsxy+fQ871N1jJyZKreMX21BBLhyw cl/A3TzM3qOQMwzRBIe1yf2iHYFKLFz7fp9ai92vU/zfmRCZwxwm6Ul/wO5JmCt8JZB2 YvMQ== 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=mo7IlxycdUcsXlVAAWyr5S1jTS6gZDKLQX9efrDt4y4=; b=PwoZbNJJom0hmWIs+Is+zhHULs+gtYrWcDbDB6sgLs9e1FP1aS82fXItldgtbMJl+b 12YoyJoEduXAtW1pSdCDt3PbIkNvgnRQf2kZnC6gdk7A5UF54tEEERP9i5wO8IBtrZ4d e6rWP9qbgyYhQMQQiAAp3hMa3humm/1qaXVkSOlb0dP8PR0TLaaslrmryMn6ntj4+NC4 3QtIlJpMmLWsWAPOrhK3/noDUa/a75A8uwB7/VXUvJC2NimldRM+H3lO3xP4e8iz6beb kitgTUzevggqGSTW5mN17RHYkd5Pj2QfmQ3OlYse8pymzK4NiF3LLaSWMKdBYESubFvo X+Ow== X-Gm-Message-State: AOAM531xss2orpRBJXEsFXmr7oqmrreSPlDFBYSUjrZiKXCVUtNVPiTo sS3zladWcsI3paKC7R++WaGU7cFHqyw= X-Received: by 2002:a37:6801:: with SMTP id d1mr565647qkc.399.1642039019144; Wed, 12 Jan 2022 17:56:59 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:58 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:56:10 -0300 Message-Id: <20220113015612.448-29-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 117/281] oma: 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: QcX1uPpzYd+t From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavformat/oma.h | 2 ++ libavformat/omadec.c | 35 ++++++++++++++--------------------- libavformat/omaenc.c | 4 ++-- 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/libavformat/oma.h b/libavformat/oma.h index 85d5932f1d..1a8e16f6d6 100644 --- a/libavformat/oma.h +++ b/libavformat/oma.h @@ -23,6 +23,8 @@ #include +#include "libavutil/channel_layout.h" + #include "internal.h" #define EA3_HEADER_SIZE 96 diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 4c418a5ff2..066b2d85bd 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -60,19 +60,16 @@ static const uint64_t leaf_table[] = { }; /** map ATRAC-X channel id to internal channel layout */ -static const uint64_t oma_chid_to_native_layout[7] = { - AV_CH_LAYOUT_MONO, - AV_CH_LAYOUT_STEREO, - AV_CH_LAYOUT_SURROUND, - AV_CH_LAYOUT_4POINT0, - AV_CH_LAYOUT_5POINT1_BACK, - AV_CH_LAYOUT_6POINT1_BACK, - AV_CH_LAYOUT_7POINT1 +static const AVChannelLayout oma_chid_to_native_layout[7] = { + AV_CHANNEL_LAYOUT_MONO, + AV_CHANNEL_LAYOUT_STEREO, + AV_CHANNEL_LAYOUT_SURROUND, + AV_CHANNEL_LAYOUT_4POINT0, + AV_CHANNEL_LAYOUT_5POINT1_BACK, + AV_CHANNEL_LAYOUT_6POINT1_BACK, + AV_CHANNEL_LAYOUT_7POINT1 }; -/** map ATRAC-X channel id to total number of channels */ -static const int oma_chid_to_num_channels[7] = { 1, 2, 3, 4, 6, 7, 8 }; - typedef struct OMAContext { uint64_t content_start; int encrypted; @@ -474,8 +471,7 @@ static int oma_read_header(AVFormatContext *s) /* get stereo coding mode, 1 for joint-stereo */ jsflag = (codec_params >> 17) & 1; - st->codecpar->channels = 2; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; st->codecpar->sample_rate = samplerate; st->codecpar->bit_rate = st->codecpar->sample_rate * framesize / (1024 / 8); @@ -501,8 +497,8 @@ static int oma_read_header(AVFormatContext *s) "Invalid ATRAC-X channel id: %"PRIu32"\n", channel_id); return AVERROR_INVALIDDATA; } - st->codecpar->channel_layout = oma_chid_to_native_layout[channel_id - 1]; - st->codecpar->channels = oma_chid_to_num_channels[channel_id - 1]; + av_channel_layout_copy(&st->codecpar->ch_layout, + &oma_chid_to_native_layout[channel_id - 1]); framesize = ((codec_params & 0x3FF) * 8) + 8; samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100; if (!samplerate) { @@ -519,8 +515,7 @@ static int oma_read_header(AVFormatContext *s) break; case OMA_CODECID_LPCM: /* PCM 44.1 kHz 16 bit stereo big-endian */ - st->codecpar->channels = 2; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; st->codecpar->sample_rate = 44100; framesize = 1024; /* bit rate = sample rate x PCM block align (= 4) x 8 */ @@ -530,16 +525,14 @@ static int oma_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); break; case OMA_CODECID_ATRAC3AL: - st->codecpar->channels = 2; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; st->codecpar->sample_rate = 44100; avpriv_set_pts_info(st, 64, 1, 44100); oc->read_packet = aal_read_packet; framesize = 4096; break; case OMA_CODECID_ATRAC3PAL: - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; - st->codecpar->channels = 2; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; st->codecpar->sample_rate = 44100; avpriv_set_pts_info(st, 64, 1, 44100); oc->read_packet = aal_read_packet; diff --git a/libavformat/omaenc.c b/libavformat/omaenc.c index 1c4edcac5c..246f5195fb 100644 --- a/libavformat/omaenc.c +++ b/libavformat/omaenc.c @@ -58,7 +58,7 @@ static av_cold int oma_write_header(AVFormatContext *s) switch (par->codec_tag) { case OMA_CODECID_ATRAC3: - if (par->channels != 2) { + if (par->ch_layout.nb_channels != 2) { av_log(s, AV_LOG_ERROR, "ATRAC3 in OMA is only supported with 2 channels\n"); return AVERROR(EINVAL); } @@ -78,7 +78,7 @@ static av_cold int oma_write_header(AVFormatContext *s) case OMA_CODECID_ATRAC3P: avio_wb32(s->pb, (OMA_CODECID_ATRAC3P << 24) | (srate_index << 13) | - (par->channels << 10) | + (par->ch_layout.nb_channels << 10) | (par->block_align/8 - 1)); break; default: