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 89A4C42F24 for ; Thu, 13 Jan 2022 02:41:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DDA2F68B89B; Thu, 13 Jan 2022 04:05:51 +0200 (EET) Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C1EE68B868 for ; Thu, 13 Jan 2022 04:05:47 +0200 (EET) Received: by mail-qt1-f172.google.com with SMTP id q14so5330960qtx.10 for ; Wed, 12 Jan 2022 18:05:47 -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=tw+g35iHNMAdTkVJRV8py7AyB8Y2LV+C0BZ4HSt+/Vs=; b=SD9TRJwLrAGlrDvtMx8CIluCm8BP+mhCIC56u/HouOfV8dwjp+cfPdLFFzOrappjaH INTwQ5dgd+mRzgsKfjCHPlpownRHE65PStqkFLsujI9b5LF8gMvBnSy4cuMEHFyHR/CQ JGMQCHa48jhlm6zlb4yKMu/efX4BK8aHSkT8ylskX27PR+TCfiC+DrR+lMlPiuTpAR7/ Xcm8vEE3gZsgMcGpfr3gqI8T9jbe19aAXm/nbJgxLdVY4cT2IxzQjjm2UdXz8e/gd1Kx 4we0F8Phae7ktesqhb1qMoAZPF6i6tZaDgVxEsmPXFyP8paffHnbbt7XJt9diSId+0mk ZfPw== 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=tw+g35iHNMAdTkVJRV8py7AyB8Y2LV+C0BZ4HSt+/Vs=; b=0qt6ftXOomgpTLcl7g2K+EIxnYnEPxRvmzw6i/YuHxITntaCJtFYtVvTUxrGQ1NQ+C yih/Dgl75p4jVy71yXgoeA6X+xzf0KnH45LtTnPoi3/eyh1dA80fHjdF1L3O7Vy6XPH1 gNjRL9AtRLzOhiTWRBnsTDoSLGoWZYjjCrKW9EeeOdpSsy9qLB3ZIC0I/Tm1y35lIchK 6eA7tuOTy2mN9dLEmGSnwglz8gw1eQTgJ4kJbueuJTRGL/Qu3z3wVQG6AqaSWSiDwV8N gbAMEJJwK9tJOyyqP7nB/H46WeeVcC7jr1GgBn9X21oUQCCoS4a+szsqKwRrafiDZRcr VFhg== X-Gm-Message-State: AOAM533cVPm+qanXLv98gtGQi/I8TkoUkcpor2u0GaJ+KlU8yQ7N++nv EwG+C18w9EQS3Hagg2cL+++cSI3W03c= X-Google-Smtp-Source: ABdhPJwsL+6BLINV6azI1XIXFtFX9V2sYPJhoPBpmF2m4d+L38kMOqNM6/vIyScbxqf0bFly9v/yeg== X-Received: by 2002:a05:622a:312:: with SMTP id q18mr2029774qtw.367.1642039546176; Wed, 12 Jan 2022 18:05:46 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id k9sm1264556qko.29.2022.01.12.18.05.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:05:45 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:05:01 -0300 Message-Id: <20220113020518.730-13-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 222/281] libcelt: 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: Anton Khirnov Signed-off-by: James Almer --- libavcodec/libcelt_dec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/libcelt_dec.c b/libavcodec/libcelt_dec.c index c0fb4013c9..6ee6e29443 100644 --- a/libavcodec/libcelt_dec.c +++ b/libavcodec/libcelt_dec.c @@ -61,13 +61,13 @@ static av_cold int libcelt_dec_init(AVCodecContext *c) struct libcelt_context *celt = c->priv_data; int err; - if (!c->channels || !c->frame_size || - c->frame_size > INT_MAX / sizeof(int16_t) / c->channels) + if (!c->ch_layout.nb_channels || !c->frame_size || + c->frame_size > INT_MAX / sizeof(int16_t) / c->ch_layout.nb_channels) return AVERROR(EINVAL); celt->mode = celt_mode_create(c->sample_rate, c->frame_size, &err); if (!celt->mode) return ff_celt_error_to_averror(err); - celt->dec = celt_decoder_create_custom(celt->mode, c->channels, &err); + celt->dec = celt_decoder_create_custom(celt->mode, c->ch_layout.nb_channels, &err); if (!celt->dec) { celt_mode_destroy(celt->mode); return ff_celt_error_to_averror(err); @@ -119,8 +119,8 @@ static int libcelt_dec_decode(AVCodecContext *c, void *data, return ff_celt_error_to_averror(err); if (celt->discard) { frame->nb_samples -= celt->discard; - memmove(pcm, pcm + celt->discard * c->channels, - frame->nb_samples * c->channels * sizeof(int16_t)); + memmove(pcm, pcm + celt->discard * c->ch_layout.nb_channels, + frame->nb_samples * c->ch_layout.nb_channels * sizeof(int16_t)); celt->discard = 0; } *got_frame_ptr = 1; -- 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".