From patchwork Thu Jan 13 02:06:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33512 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp44078iog; Wed, 12 Jan 2022 18:46:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJyWNfCJj/m8oIZTOtrfV43FjaGXyG9vQDcwE9JJbWcX268CCSipkV14l6+LMzP/1hsTeFF+ X-Received: by 2002:a17:906:228d:: with SMTP id p13mr1857108eja.415.1642041995937; Wed, 12 Jan 2022 18:46:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041995; cv=none; d=google.com; s=arc-20160816; b=xQDX111sn6NXo8t08kefc9ySpg4nVWVNjKzv3XCS/G4BUDtAyaCQx77NsKuT5qEj8f wBHQ619eSl1lGd9zshcEGWCcrWjdSXm453sKsdUAIUHStffI9gAiVikHkDti8MrcQLwP LPa3iCX5y6gE0bRhhS6dSz13vSMrz79irnMv1EgrZdW/jxPRNCaGItKW1GbSd3TiXArv DP6CJ1THjJNXkLPuAjE6U836BnY+ARtwU5kN42P2JLKn0khMVXOCQZSKz78VpGUfTx2M 9E1rIkJOTi1Ap+/lUAsIDhrRqSJDm/OKuzFQP33QKKtmsLThcGqXgg4sKociDfW5tGO+ MY3Q== 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=kPHmBxhPAR3ogR/c4VxAyEM+OqcKxTscRbVoiCNRPKc=; b=zp7rIZ8XT5vz8CFIfGjhX/wlxvLlK6dt3ilqt06xDh8QdYkZo+FqvkRuoynML4lDsS eykraY+PU5+Gi1SxNSBSUj8y9SpIbzWbyOAWVtmf1Su/RArCf7dv1jk2vUsETohezfMn 0QXY/LhYD9MNhd+zl2kCbforwqzjgTwzcuYuKxTmnpZpIwK28jkCS8ae4qSaJ8zvb/Oy 0vO9Ya9IaMD9v9unYOObfR5lr8EKh1w3qxJcKSMnqfxWHNJySLtL57EfpKmhzRqMRlrn pwOxz4/WJQFI4tO6rN6liy1gdk41tf0rIBmm4C97NMV9HZ1q+JP1dlfUdYDrrx8Yq95i g3zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=giTPeHIc; 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 ho19si936887ejc.270.2022.01.12.18.46.35; Wed, 12 Jan 2022 18:46:35 -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=giTPeHIc; 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 B30A268AEC8; Thu, 13 Jan 2022 04:07:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B453A68B97C for ; Thu, 13 Jan 2022 04:07:38 +0200 (EET) Received: by mail-qv1-f52.google.com with SMTP id hu2so5109513qvb.8 for ; Wed, 12 Jan 2022 18:07:38 -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=Mi74kOYexCds7ZrxKSDYjsa2O2N6lC6rpnhswo7R6HU=; b=giTPeHIcSfCwx0Vj5W21UPO8+OR7/CrFV178F8uNpxk3WZF3//iX9Cq8/79dHPQB+i FJGjISnbJ+zrtpt+fc66UExcox0kyGjcBGLMrAxm1WliFbUU1fdWSTmjeAqeJzT1tHZb EGNascP7HHsNM9bwqbLiEByc7DTqR4XHC08vE+aAbL7MrtivckC+KAxiCTJKkz355h1i 7Oj5B2wHKl1VxYtzZKKa9fVCMxAF4EBJ71L9X4Zk/3CDyW9MFC2/0KbKVZyrN6Kjbhv9 1NgexHWtpVPGL1MrcJNON1IqhGvK6D6GPCZvsAXDVJzkZhYZ4hJlPR+l3lKfjh7I0kUA L+pg== 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=Mi74kOYexCds7ZrxKSDYjsa2O2N6lC6rpnhswo7R6HU=; b=BTBCtDUrJW8tNL+YkzJBvI6fu+7lCNXB4QaZl+i55KOMUMg5v3Dtfkk94HhZeCZwQP Ua+DQGR40rq+e865fF+o+KT4q9bPYdGM13W2TbacxYm5djvG2BfTFQi97PUXMpX4GDNz cS2Km0lDmv4XsgTiMAGVww4cbemZrVUw/yFuMoQ4LZkZxp4aS/sPsb3uTjIRMifsEP6N laFODfIFpS+/rGkYn2swC2xOSG+1P0iEW6Ns48X+4K8D1caGhSOjbsCqgNMqz5LpW8Lp WLgzw/uX3HeG8R77eBzl1eLHJM/EA/mKMxFuuX/+vi5POZoa2Qvc5I0OlpsFjf8suX6P /QkQ== X-Gm-Message-State: AOAM5315toZtIKY4U64vDn1zTjPToS6Ptr8qy8QOQeMFK8Qed1Nt7Jgq EdDaLqxdc1j6FRROYE5jfij2EKDI/Ps= X-Received: by 2002:a05:6214:262e:: with SMTP id gv14mr2305338qvb.5.1642039657088; Wed, 12 Jan 2022 18:07:37 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a16sm1085946qta.13.2022.01.12.18.07.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:07:36 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:06:52 -0300 Message-Id: <20220113020713.801-9-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 248/281] qdmc: 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: k5nTDFbxN1iA From: Anton Khirnov Signed-off-by: James Almer --- libavcodec/qdmc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/qdmc.c b/libavcodec/qdmc.c index ae75ca524a..dfdd84870c 100644 --- a/libavcodec/qdmc.c +++ b/libavcodec/qdmc.c @@ -245,13 +245,14 @@ static av_cold int qdmc_decode_init(AVCodecContext *avctx) } bytestream2_skipu(&b, 4); - avctx->channels = s->nb_channels = bytestream2_get_be32u(&b); + s->nb_channels = bytestream2_get_be32u(&b); if (s->nb_channels <= 0 || s->nb_channels > 2) { av_log(avctx, AV_LOG_ERROR, "invalid number of channels\n"); return AVERROR_INVALIDDATA; } - avctx->channel_layout = avctx->channels == 2 ? AV_CH_LAYOUT_STEREO : - AV_CH_LAYOUT_MONO; + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout = s->nb_channels == 2 ? (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO : + (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; avctx->sample_rate = bytestream2_get_be32u(&b); avctx->bit_rate = bytestream2_get_be32u(&b); @@ -277,7 +278,7 @@ static av_cold int qdmc_decode_init(AVCodecContext *avctx) s->frame_size = 1 << s->frame_bits; s->subframe_size = s->frame_size >> 5; - if (avctx->channels == 2) + if (avctx->ch_layout.nb_channels == 2) x = 3 * x / 2; s->band_index = noise_bands_selector[FFMIN(6, llrint(floor(avctx->bit_rate * 3.0 / (double)x + 0.5)))];