From patchwork Thu Jan 13 02:05:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33490 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp41272iog; Wed, 12 Jan 2022 18:41:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJxBb2P4A474Q+Z9zXnk0f4YkU9hgtLDOsRF25xMb+OjGIg8geWMmM7H6qRuiDzGgzf/fj4Y X-Received: by 2002:a05:6402:655:: with SMTP id u21mr2353282edx.30.1642041661686; Wed, 12 Jan 2022 18:41:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041661; cv=none; d=google.com; s=arc-20160816; b=naWGQa8BX92+N/OG+t3/OoujBW2QxljwLvpI5RSW0kp1QfXSiExvqoZ+IuXvAeOim0 BNjjzgZPIPrYf9FfPgmXuVp1bguLPGv6YvGh6Z+7iP/j54UWQtn/WR0AyuwpAOzmNEKN P4LjnJuLl8rnqwsUKadoQ627rsLLjtPb7iND8k9jTH39KZO8hzzQV1zQ0ovcgdYDKJmf njFmPQm30e5zKSaiVHNLuyoQ4h1Lhq2l5dbJgUfFtfyN2qcl8znjehGzjWhwR/zAd62C 9SDzNsQjV7xgN8ElqtNC01AFstgCh/8PB4gaDzAQWnlre5vwnjpZzluaNr7SgG2TRVKp 1meA== 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=wNd/pxR56uPBdfdL143lXZWFIx8qAyh2fWoFP1lOzy4=; b=Uu2O2fhHzpZ1b4h/PPdENMVMRydLfdG1f9jd5Hp0AXRBZzci8zxk1etKTwd7lCrLWa TQ3vrI4GVW7JvwEeM/sawTAQsoUYElRU16bPERxerJb18uCCChwZEyL/tjHA3PIImKCr LIURJs3fzACOpimxz4h7Px0RrtD/oV52vRmnITejKsQcMsHF3g6B6s/mrtpYsa6sI1ij fOMRmDb+uhBuSBvxulmVVwK2gyNa/kd0XxJN/0QIThfRkSfHdTLBoQ2CBdKx+yE4CR1l HSUCF4AgCCAMIlgyoFr4fDMqiCV4cvw0eq4ENbTUe/Co86rq8ENjWcqbJGxmD0EtN39I Oh2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BZDBk1ZQ; 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 v7si918651edb.41.2022.01.12.18.41.01; Wed, 12 Jan 2022 18:41:01 -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=BZDBk1ZQ; 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 1CFC868B88F; Thu, 13 Jan 2022 04:05:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87EE168B85C for ; Thu, 13 Jan 2022 04:05:46 +0200 (EET) Received: by mail-qt1-f170.google.com with SMTP id bp39so5329378qtb.6 for ; Wed, 12 Jan 2022 18:05:46 -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=oJeyEdxQPed5C4Bc6CR7vq17p6kRgfuEnXfoPbAmCrU=; b=BZDBk1ZQazwiyrPLf3F7B52KiGR1kYkhJt5Z9JptbPqQc/9BP9L/fIjBE1+U/UjXgE 4HrJzq/eRwamXgTo3yg/lTgDwzazevCU3bMvXFxCKVwm8GXEHHDvN7O7hhMtmctw4Xlb 31viga0/YpeFAkAuNAaECXk8parGQuHX2YkSHRnon3wLCXF6a6JHsfJjOUCsYfeAPupt R1I3I6ZDCdi6CO80b0R0nHxMT9k2ShvfLlt3LO8BixAnCuP8KsdCVmXtfeGCZi+4Ey4M VZ6hH0dtHoXJIcNt0FMtEv9r4XTIVYhghLelReC2AefRY/xtTYyWixYoRbvJBQX5DO0X oLUA== 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=oJeyEdxQPed5C4Bc6CR7vq17p6kRgfuEnXfoPbAmCrU=; b=Yed3R2azpDA2a9rgdfbkhwMpr4jTfYvaoUC7wrKQG/JRxtaALvlk2iyBHYFnDB5msq WCCRa5j6qHd0a7bhnixuTx+5Iat+nlN+ooFCTFpXySQHg1fGi70iU4GL5BBt97lUuTrF KjEp0tD0UHqmmA20Sl3CDmSdErE4ri0uHFtS4/2Zva5fKge0Bz3+hP+x/sbkNsoerQ8R lNb/0QAvyn/WxjfSAVoCiLO54RVMlV4cvLn1R6ZMkc3yBs2e3Zf1JNa76gZzVS7v+pXR dngELr3bXnG9HRDs5m8M2M+/mGZkJLfWpDOUtXez3CRs/4DX0tPdsmqEmIWlwmE9VroR qrtQ== X-Gm-Message-State: AOAM531ncOzhUir3E8CWhwPmxSHYAvvmUFjxV/qLKnK9l+EG4s/1CBZ2 y6sG0g9ZR42BX0Uq7Ql0o84rGRPrz6c= X-Received: by 2002:ac8:5e0f:: with SMTP id h15mr1994417qtx.499.1642039544969; Wed, 12 Jan 2022 18:05:44 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id k9sm1264556qko.29.2022.01.12.18.05.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:05:44 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:05:00 -0300 Message-Id: <20220113020518.730-12-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 221/281] interplayacm: 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: 0j42+VxBarv1 From: Anton Khirnov Signed-off-by: James Almer --- libavcodec/interplayacm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/interplayacm.c b/libavcodec/interplayacm.c index c11178a9ee..7b4e539239 100644 --- a/libavcodec/interplayacm.c +++ b/libavcodec/interplayacm.c @@ -79,12 +79,12 @@ static av_cold int decode_init(AVCodecContext *avctx) if (avctx->extradata_size < 14) return AVERROR_INVALIDDATA; - if (avctx->channels <= 0) { - av_log(avctx, AV_LOG_ERROR, "Invalid number of channels: %d\n", avctx->channels); + if (avctx->ch_layout.nb_channels <= 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid number of channels: %d\n", avctx->ch_layout.nb_channels); return AVERROR_INVALIDDATA; } - s->max_samples = AV_RL32(avctx->extradata + 4) / avctx->channels; + s->max_samples = AV_RL32(avctx->extradata + 4) / avctx->ch_layout.nb_channels; if (s->max_samples == 0) s->max_samples = UINT64_MAX; s->level = AV_RL16(avctx->extradata + 12) & 0xf; @@ -585,7 +585,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, if ((ret = init_get_bits8(gb, buf, buf_size)) < 0) return ret; - frame->nb_samples = FFMIN(s->block_len / avctx->channels, s->max_samples); + frame->nb_samples = FFMIN(s->block_len / avctx->ch_layout.nb_channels, s->max_samples); s->max_samples -= FFMIN(frame->nb_samples, s->max_samples); if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; @@ -596,7 +596,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, return ret; samples = (int16_t *)frame->data[0]; - for (n = 0; n < frame->nb_samples * avctx->channels; n++) { + for (n = 0; n < frame->nb_samples * avctx->ch_layout.nb_channels; n++) { int val = s->block[n] >> s->level; *samples++ = val; }