From patchwork Thu Jan 13 02:05:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33491 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp41365iog; Wed, 12 Jan 2022 18:41:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/FhFEWRZUpoE7YdvjYMcJRep9VMJKzE51KDOa8c5hCJOtApOD/JI+EB1xecggthEZPhKy X-Received: by 2002:a05:6402:26c5:: with SMTP id x5mr2285984edd.223.1642041673328; Wed, 12 Jan 2022 18:41:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041673; cv=none; d=google.com; s=arc-20160816; b=gzpNYvYCHSoqXrK3pnImHE+UOouvhf1VBopjKdBB3L7PEWYbSEycLpHVkZWn4L9Xsc 0ywhqH54yNJaROUOpzdpFIiuWMX6MjxbRoCOX6CC/kDw6JRJ8femWYjFfVJmR75R6Rt0 NivyCgVY04+gT80KiIZqA+Adlt4UMMMpEnBcVPscqFCgfQoaPuIOPMEWwr8A0UnjHctZ zMV6/K0CwWKdZVOwkARCCcsMcdIxyI0AyxbjUP0x3M4ELu00CnQ+Wots66IZi4cOWTh5 f/ZbjgETUIwcmQnWArIU60jqz7bhrQYrhnugY0OmPBVo3EzZeudTGWdDztoARMO0XdEC Nkng== 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=2kjN5TDg9prRlSNQblIMksEs68G99KhiESn3WpI4PIg=; b=BK3EpcQDDaK2/FKuje8UChdqlv38EKExsd8P5C27b3n1VbJdbNZZdKohXmxo+rOZ4I PLYDsGvuAyamuGGe+wsj8D7SBVTiotG0Vo00H5nkecRMHdREjrpjVVYNM7mKE+YXP334 Ngj58dFhtJnUEwkkOYt0UaRmxO67TMnQrLxDesnz+TaC3Kkv9MPF/8UrJIuSjOwiYRxs 6Bksgu6llhVaoFOsQ0zMcjBtBUvzPiioTZMsPWO+siAdExNMZXXZBSrbjZSFSW6py4tO 1xQMf6HvvXOYGqCJjJ116ridM/X4Ikb4e2B78IIQotGxOVRAwfNrb2Yl+GNCnKUoYhMJ yPqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=SD9TRJwL; 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 s1si959391edd.28.2022.01.12.18.41.13; Wed, 12 Jan 2022 18:41:13 -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=SD9TRJwL; 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 0FFDD68B87F; Thu, 13 Jan 2022 04:05:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: B4fyTO3sb03W 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;