From patchwork Thu Jan 13 02:02:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33462 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp37805iog; Wed, 12 Jan 2022 18:34:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJwVbnWuM9bfrFKJLiZ9BInbUhmU4mcR6es1XixYjPpBVHRhwcL5acChUs/g0UPwigiSbzf7 X-Received: by 2002:a17:907:1693:: with SMTP id hc19mr2065876ejc.660.1642041260038; Wed, 12 Jan 2022 18:34:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041260; cv=none; d=google.com; s=arc-20160816; b=gqbgq8mfyOzxXK4470ZnN/7WNid+CnIWsBuQVtTuaEDl3YwVeQ6zNnYZa6lJJkE0Sr JekgGdBikvUQFZuwzbuH+9VOB8sYnAjd13LqlGnt8UDGxvxSYtI2fczTUoezk/qGBCKD UsAxmQosaAFchxtomwsc1ZhDSyz/rMUeuUaHgspiJvlkrPGWgGqD7r0R1UEtI8ljWWw+ goyl85HCBYyOgd00+DJOSTbaJZsGnsO0yout+Z9ELwZ6kZIQOnOj3rwhr+2lBcKVmNka P0lbxDoemWsZZdw+2W9h3R8M/T3PwGVOUhVr5n23zqfwslOGIhUasHZO40ua0dgElevG rCnQ== 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=JDCTqzbwwij+yrYFlMJ3zUnZWj0oI+ZDEGq5bgDfi4c=; b=E9oMaif5/1sZdSnWL5S9UtQWiqGUVfo08JHhKq+ivc3dShKWrrBxJxTRUbqfuNqWPP zNpZs8iy7udb/METduVcutmU44wH7KKOOllG8MRWohqnliHr/kqjUzC59zC2pFaGiZIr wnp/IiGeCgmROLVBVfoylh9HSokVwbiOzowk0L88ASdVPeH8Rf4pjW2T4+nR08kt19WL uNnAxVj+53WILd3cMjCKfNYp58/5xxgewDfyXvmHA35d+WiBoji3PvLJkyTvzTsOQRFT Gi5qWEFBBbitNuI7JsbejTevf5DLxu4jPqCYyG0JlN04kcwzCTMqZ57uiQo1G+IGgmfY AIaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=FLcwwFjp; 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 v25si879316edd.190.2022.01.12.18.34.19; Wed, 12 Jan 2022 18:34:20 -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=FLcwwFjp; 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 0436868B615; Thu, 13 Jan 2022 04:03:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E783368B5BA for ; Thu, 13 Jan 2022 04:03:04 +0200 (EET) Received: by mail-qv1-f54.google.com with SMTP id t7so5169635qvj.0 for ; Wed, 12 Jan 2022 18:03:04 -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=otFIrGlK/AFqctJcFoKP9vtS+3aGtuvWoRY5M1mjKq8=; b=FLcwwFjpCjz/TUigaPEX7E+uKC1EX8JgvHnO55u/JXGi9xcChhNqikBYCWfxT4s+nI ixTkyOz3jscqk9Bpplfd+BZWb/d6Qj2BlLwX39XUmvCI21oShpGrF3bKLfcWIzwEIxho 6YmXeIQLUhBAjGISsg6bV1eyX+Jt66VJXT3TYeHS4osEehLzdSdf1fGikwWlbekl4hGU VuqKm25E2SSm2ULs9O9aAfDQX3MKbgA8qa3I6v2yTzTpTeCnoEP94epP/9fNX0sgSBwK +W5mAp1kYPA2fyCdatax/PNUgaSyydEN/Duo+hZ8YMyf0DjYA1yvjxXjfEyZp4JiDkZJ Q4bg== 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=otFIrGlK/AFqctJcFoKP9vtS+3aGtuvWoRY5M1mjKq8=; b=BhWOUh0XuWy3eQg6TTOcmF1HFPJT0q5f1jBzteHOSOmtqJh5c9dW+7zfIwWnf1NjMi SP8XH5GXrpkFy7YnnK/VAIKpDLbQ79ef0UmuZ5w14OUwfKppPIMWjTFDKv4OES5FMGN4 w3bNALN4TBkSZkYzINFLo4ojtoSnlRpk0xxYe0WMTpKRI/XTd70tZoOTqURFHYSLozeG pV5tXef1OTaeamgi3Je2/QhbCGZM0AB4kPu4fA7IZsL/LIXHSIWDyriFxEcofWV8RZqK cG2ZwPp+CmOTcYEQsesY7GpAo69Mxxkah0KbjyyboOaJwuB0c35pIS2SxfPE5LfYJXCm hmYA== X-Gm-Message-State: AOAM5330cv+t/V1XaW2YvPl3JCUNWzspcbGxBGXb1we0xqfZ2yc9qPN/ HZ7VgaZW+e8p/wCrLNenzqAQG2O6+Ng= X-Received: by 2002:ad4:5d4c:: with SMTP id jk12mr2433855qvb.83.1642039383411; Wed, 12 Jan 2022 18:03:03 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id v1sm1045961qtc.95.2022.01.12.18.03.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:03:03 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:02:18 -0300 Message-Id: <20220113020242.661-6-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 185/281] adx: 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: TSyRJbqowPvZ From: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavcodec/adx.c | 16 +++++++++++----- libavcodec/adxdec.c | 6 +++--- libavcodec/adxenc.c | 11 ++++++----- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/libavcodec/adx.c b/libavcodec/adx.c index cd88b16660..c60fabb40b 100644 --- a/libavcodec/adx.c +++ b/libavcodec/adx.c @@ -38,7 +38,7 @@ void ff_adx_calculate_coeffs(int cutoff, int sample_rate, int bits, int *coeff) int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, int bufsize, int *header_size, int *coeff) { - int offset, cutoff; + int offset, cutoff, channels; if (bufsize < 24) return AVERROR_INVALIDDATA; @@ -58,18 +58,24 @@ int ff_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, } /* channels */ - avctx->channels = buf[7]; - if (avctx->channels <= 0 || avctx->channels > 2) + channels = buf[7]; + if (channels <= 0 || channels > 2) return AVERROR_INVALIDDATA; + if (avctx->ch_layout.nb_channels != channels) { + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + avctx->ch_layout.nb_channels = channels; + } + /* sample rate */ avctx->sample_rate = AV_RB32(buf + 8); if (avctx->sample_rate < 1 || - avctx->sample_rate > INT_MAX / (avctx->channels * BLOCK_SIZE * 8)) + avctx->sample_rate > INT_MAX / (channels * BLOCK_SIZE * 8)) return AVERROR_INVALIDDATA; /* bit rate */ - avctx->bit_rate = avctx->sample_rate * avctx->channels * BLOCK_SIZE * 8 / BLOCK_SAMPLES; + avctx->bit_rate = avctx->sample_rate * channels * BLOCK_SIZE * 8 / BLOCK_SAMPLES; /* LPC coefficients */ if (coeff) { diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index 20256a092e..b3d946e81c 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -46,7 +46,7 @@ static av_cold int adx_decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "error parsing ADX header\n"); return AVERROR_INVALIDDATA; } - c->channels = avctx->channels; + c->channels = avctx->ch_layout.nb_channels; c->header_parsed = 1; } @@ -132,7 +132,7 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data, av_log(avctx, AV_LOG_ERROR, "error parsing ADX header\n"); return AVERROR_INVALIDDATA; } - c->channels = avctx->channels; + c->channels = avctx->ch_layout.nb_channels; c->header_parsed = 1; if (buf_size < header_size) return AVERROR_INVALIDDATA; @@ -147,7 +147,7 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data, /* if the packet is not an even multiple of BLOCK_SIZE, check for an EOF packet */ - if (!num_blocks || buf_size % (BLOCK_SIZE * avctx->channels)) { + if (!num_blocks || buf_size % (BLOCK_SIZE * c->channels)) { if (buf_size >= 4 && (AV_RB16(buf) & 0x8000)) { c->eof = 1; *got_frame_ptr = 0; diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c index c5849a40a1..3736e746a9 100644 --- a/libavcodec/adxenc.c +++ b/libavcodec/adxenc.c @@ -107,7 +107,7 @@ static int adx_encode_header(AVCodecContext *avctx, uint8_t *buf, int bufsize) bytestream_put_byte(&buf, 3); /* encoding */ bytestream_put_byte(&buf, BLOCK_SIZE); /* block size */ bytestream_put_byte(&buf, 4); /* sample size */ - bytestream_put_byte(&buf, avctx->channels); /* channels */ + bytestream_put_byte(&buf, avctx->ch_layout.nb_channels); /* channels */ bytestream_put_be32(&buf, avctx->sample_rate); /* sample rate */ bytestream_put_be32(&buf, 0); /* total sample count */ bytestream_put_be16(&buf, c->cutoff); /* cutoff frequency */ @@ -125,7 +125,7 @@ static av_cold int adx_encode_init(AVCodecContext *avctx) { ADXContext *c = avctx->priv_data; - if (avctx->channels > 2) { + if (avctx->ch_layout.nb_channels > 2) { av_log(avctx, AV_LOG_ERROR, "Invalid number of channels\n"); return AVERROR(EINVAL); } @@ -144,6 +144,7 @@ static int adx_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, ADXContext *c = avctx->priv_data; const int16_t *samples = frame ? (const int16_t *)frame->data[0] : NULL; uint8_t *dst; + int channels = avctx->ch_layout.nb_channels; int ch, out_size, ret; if (!samples) { @@ -162,7 +163,7 @@ static int adx_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, return 0; } - out_size = BLOCK_SIZE * avctx->channels + !c->header_parsed * HEADER_SIZE; + out_size = BLOCK_SIZE * channels + !c->header_parsed * HEADER_SIZE; if ((ret = ff_get_encode_buffer(avctx, avpkt, out_size, 0)) < 0) return ret; dst = avpkt->data; @@ -177,8 +178,8 @@ static int adx_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, c->header_parsed = 1; } - for (ch = 0; ch < avctx->channels; ch++) { - adx_encode(c, dst, samples + ch, &c->prev[ch], avctx->channels); + for (ch = 0; ch < channels; ch++) { + adx_encode(c, dst, samples + ch, &c->prev[ch], channels); dst += BLOCK_SIZE; }