From patchwork Thu Jan 13 02:02:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33480 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp39764iog; Wed, 12 Jan 2022 18:38:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJw88a7pWlF1S9kHD6RCtCAEbJbinhQeRIKGYDSN2WTSedFWC0Trgu6TgO/VUwIO6nOYj7vs X-Received: by 2002:a17:907:6095:: with SMTP id ht21mr1917161ejc.625.1642041483624; Wed, 12 Jan 2022 18:38:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041483; cv=none; d=google.com; s=arc-20160816; b=AxmUOa3NrjppIoGbUD9cdY2EuwSzar5o8Frw4PIUwIwYFCJgqo2i3YA23e2rsCxHpC AMEjAkE9r0/Xo36qXVTYdNJgm3YbW25/+OsD6YcdnFS1p6GkTByM3g/TR9MRp110Xk6/ lV0BByBRBqIKnzOeAr3JdGJimBZk7N+O6kaukZtYkneEX4O2wswzPd21C6Bms1OzPVvJ RUxtu2MLeoFlWI6JBEtqJaDlH7ZxPqvH0yrLZUphGRfwWCjiTCHnkEFfjUe+/VFnKMo7 5Z3AamOys3shM++de5YamCKeIxLYIxOCi+s09AADRx5JXdmq0t+hW++dsjY7qPu0+jB3 u3Fg== 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=JTjg+AKUJWu1US37BwZvFJSjtMVki6im9f6whug4cA0=; b=S9pjuj0qyYr27k5M9sAk144RIALidohan8yOp/U38t6HxNGNllUkjVm7Ofe2osoJdB OoYXlEMOuRNzaV7t6HYOe21pGYqgI0+84rYps5RBZIxWRbYVS/Kb1Lln8jxqRZOeVX6n VcbJAul9oKvONAIv0VbX26803PK2PJDvEY4g5wOjhUyx/2rfbbQMNFY5sKHbsBkUW5UT LMcVtCMpeGgc4AXWH8acfo8KxEAwMBEZHOpGCMMQqUvfuAzJQ+Li0ruv1Y22rayD6MS7 R+lZzXsVz1Xzc6+IvywwyMkG7WigBH3/rJn1ixMU0UCqKAHtStTAvkkZRPSYPcB3Yu6a AaNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=K0oHccjU; 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 r12si944466edd.74.2022.01.12.18.38.03; Wed, 12 Jan 2022 18:38:03 -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=K0oHccjU; 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 0502068B7A4; Thu, 13 Jan 2022 04:03:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DC5568B792 for ; Thu, 13 Jan 2022 04:03:30 +0200 (EET) Received: by mail-qt1-f169.google.com with SMTP id c19so5362330qtx.3 for ; Wed, 12 Jan 2022 18:03:30 -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=bnWIX9DkapmTKwjBu1bI8Y3Ju0X74Vx1ZlN+F115FKc=; b=K0oHccjUo94r8dLRPq/VXIiDjRlkYYRgRFiIJWA8N/IlrNYia7TJxb2KYTaKq4G3Ws Q+5Xd7k9JiC3H+PvzyPdD12vBFvJDj/87z6V8wM2uANvYIxM8ZuNd3mPW1319baO5ckQ JTac0WdKTTWjFkTamuZiYogWUEQ/zRM2msiHcQ1OcNEIlm5jQCkgFttBsOrvPMbhxO9G rGCyeHUa0ervdsKuur4RmkOgcZlt5OvSP0b57V+KSAs9wJ4hPgjIHEq0s2a5hFpWSlkk 3GGckKQuOWUF2ozrlNURZqKNDmaYBBOXgeevbBB5hAwPCx1cGIpADrwZ8f+kVjntArEF K0qw== 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=bnWIX9DkapmTKwjBu1bI8Y3Ju0X74Vx1ZlN+F115FKc=; b=htvxTsKquHdSkR/lF3QplSM4ijKhBAz18PwPALgg6R6dSCeDmfaLNK7C5nQlKZlnOK lcHxfWIif8ofUIS8J150CJCdvM7uuaqmfU0nTAncDoWMZ4ODYRmnFqjuYGfaoEq2GpAI M12a2RRvN7LoLqz+IxyF8FZ6s9FVCKghSOaUtZSwBSlfSam53hEaGT0COH7jeeJvEMw4 OoPCfnoiliF/lFQqD4PixL0SzKB62SFwia8F/OjrSkWPw5e96Z4Pbu46hx3SmOQCvtOj 1UYYpLVpPmigIbEZM3+7ixPXCp8bHdXBWqgOS8TG/frcT0nrNCpFrjBdrZHT8eprk7l6 gQlA== X-Gm-Message-State: AOAM531XSPM1CyWlYVJiC9XC6TqZ0ER9C/lT3DxxaHi78xmkXHzkFGFG f2Jt7t+KnAaSQwWeyMIb67vUMOlQ3w8= X-Received: by 2002:a05:622a:489:: with SMTP id p9mr2001336qtx.343.1642039408778; Wed, 12 Jan 2022 18:03:28 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id v1sm1045961qtc.95.2022.01.12.18.03.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:03:28 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:02:39 -0300 Message-Id: <20220113020242.661-27-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 206/281] dst: 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: +HUMXmsTBM+r From: Anton Khirnov Signed-off-by: James Almer --- libavcodec/dstdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/dstdec.c b/libavcodec/dstdec.c index 6d0b25f4c3..78427bd15c 100644 --- a/libavcodec/dstdec.c +++ b/libavcodec/dstdec.c @@ -80,8 +80,8 @@ static av_cold int decode_init(AVCodecContext *avctx) DSTContext *s = avctx->priv_data; int i; - if (avctx->channels > DST_MAX_CHANNELS) { - avpriv_request_sample(avctx, "Channel count %d", avctx->channels); + if (avctx->ch_layout.nb_channels > DST_MAX_CHANNELS) { + avpriv_request_sample(avctx, "Channel count %d", avctx->ch_layout.nb_channels); return AVERROR_PATCHWELCOME; } @@ -97,7 +97,7 @@ static av_cold int decode_init(AVCodecContext *avctx) avctx->sample_fmt = AV_SAMPLE_FMT_FLT; - for (i = 0; i < avctx->channels; i++) + for (i = 0; i < avctx->ch_layout.nb_channels; i++) memset(s->dsdctx[i].buf, 0x69, sizeof(s->dsdctx[i].buf)); ff_init_dsd_data(); @@ -243,7 +243,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, unsigned map_ch_to_pelem[DST_MAX_CHANNELS]; unsigned i, ch, same_map, dst_x_bit; unsigned half_prob[DST_MAX_CHANNELS]; - const int channels = avctx->channels; + const int channels = avctx->ch_layout.nb_channels; DSTContext *s = avctx->priv_data; GetBitContext *gb = &s->gb; ArithCoder *ac = &s->ac;