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 A04AB42EDB for ; Thu, 13 Jan 2022 02:37:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1BC3B68B786; Thu, 13 Jan 2022 04:03:29 +0200 (EET) Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A083D68A78A for ; Thu, 13 Jan 2022 04:03:26 +0200 (EET) Received: by mail-qt1-f180.google.com with SMTP id h15so978941qtx.0 for ; Wed, 12 Jan 2022 18:03:26 -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=ck6pBAM5yWhUE26TdJ0jsFthDnQYqHO1Y0H/iaOLCkg=; b=kBOUF2EKiis9JazD/ZfzrUys44LEawZlHX7mu7vMKFSdQwxOhRb2ssjGdc6x19Npp3 WwORV0schj8JP0jEyt4ZiuZwahf8cj49D0GxfZMqXf5efRfuXt8DphC2T9SAP4pk5gRe O+wpaVvPG9AQJgTRqMDhFqOJmtVfkW8/pLnwrBml4hgvcHv1FY9tdjXV1thJ7c5HOz86 2k7KwNmMLcg6EUNqtP9ln62UbPagUt1zEBs7BTdUQa+qMN5PNDsyWQbueFuwzY0bxkFi v4OY9hn/T3tXedQfjIaKuwAAiCDnlkNqd736XWhWScnwYMOdv48nz8pkNY+biJwqHdfx K2MA== 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=ck6pBAM5yWhUE26TdJ0jsFthDnQYqHO1Y0H/iaOLCkg=; b=tcDVMD5d/zAwTxvp164dyn7QlUWKJWS4H4Ic4VrfzrQkSFkYqw1W/BsjCc1UribphC 7BUaTdgvIv7wJ6/mwDkZR3sC0cNAevmbiOg54mhjZBCUT3yrxCdyrVIv+vcp9UHsbXAm cP9016cso5AGIUJAFAKIOt4ao9f3J5gXzu7LMJBGfevX4F9Udyjr7h1kyD48EYXrVWcR 9afWEDFJr4yOUx7lZv4IYAHrzTtcy4k8G6OOAVLglq+Rg+r8c9kGvpifkt88K6/TQNHM tu24hI6Sb7kFx0UYfhzW9sZ9z76LvkHSnghgi6RatwL5VJEFM8dvR8Xi1iq6o+3n23gT 13tg== X-Gm-Message-State: AOAM531xLLpTCpJ7BBE7AkAwBid+WFYo8/y7Xiad8mFKyC6F5ALO3nMx TaurQPte7B49XHogCzV7uoieLCWLyJc= X-Google-Smtp-Source: ABdhPJxBabG6WvzthPzQ/Jare5tvDVzIbXQ3NUvG30EdL0pW4ZaxHq9R6RC1cUOmR28pr+F5kbs7gA== X-Received: by 2002:ac8:5781:: with SMTP id v1mr2036230qta.4.1642039405228; Wed, 12 Jan 2022 18:03:25 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id v1sm1045961qtc.95.2022.01.12.18.03.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:03:24 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:02:36 -0300 Message-Id: <20220113020242.661-24-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 203/281] dsd: 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/dsddec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/dsddec.c b/libavcodec/dsddec.c index 19fb75ee85..02698ee116 100644 --- a/libavcodec/dsddec.c +++ b/libavcodec/dsddec.c @@ -44,17 +44,17 @@ static av_cold int decode_init(AVCodecContext *avctx) int i; uint8_t silence; - if (!avctx->channels) + if (!avctx->ch_layout.nb_channels) return AVERROR_INVALIDDATA; ff_init_dsd_data(); - s = av_malloc_array(sizeof(DSDContext), avctx->channels); + s = av_malloc_array(sizeof(DSDContext), avctx->ch_layout.nb_channels); if (!s) return AVERROR(ENOMEM); silence = avctx->codec_id == AV_CODEC_ID_DSD_LSBF || avctx->codec_id == AV_CODEC_ID_DSD_LSBF_PLANAR ? DSD_SILENCE_REVERSED : DSD_SILENCE; - for (i = 0; i < avctx->channels; i++) { + for (i = 0; i < avctx->ch_layout.nb_channels; i++) { s[i].pos = 0; memset(s[i].buf, silence, sizeof(s[i].buf)); } @@ -84,7 +84,7 @@ static int dsd_channel(AVCodecContext *avctx, void *tdata, int j, int threadnr) src_stride = 1; } else { src_next = 1; - src_stride = avctx->channels; + src_stride = avctx->ch_layout.nb_channels; } ff_dsd2pcm_translate(&s[j], frame->nb_samples, lsbf, @@ -101,17 +101,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, AVFrame *frame = data; int ret; - frame->nb_samples = avpkt->size / avctx->channels; + frame->nb_samples = avpkt->size / avctx->ch_layout.nb_channels; if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; td.frame = frame; td.avpkt = avpkt; - avctx->execute2(avctx, dsd_channel, &td, NULL, avctx->channels); + avctx->execute2(avctx, dsd_channel, &td, NULL, avctx->ch_layout.nb_channels); *got_frame_ptr = 1; - return frame->nb_samples * avctx->channels; + return frame->nb_samples * avctx->ch_layout.nb_channels; } #define DSD_DECODER(id_, name_, long_name_) \ -- 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".