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 59F7742EC6 for ; Thu, 13 Jan 2022 02:35:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CCCCD68B647; Thu, 13 Jan 2022 04:03:19 +0200 (EET) Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AC0D68B60A for ; Thu, 13 Jan 2022 04:03:14 +0200 (EET) Received: by mail-qk1-f179.google.com with SMTP id j85so5613217qke.2 for ; Wed, 12 Jan 2022 18:03:14 -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=REPPJg2JOahjX4J1CumWD7b7ouTGdk1SL3vHEtRJv3I=; b=DHAezsNfCS9NzcZ7FgXJ7M5aXRPXcwjugSV+31+qhBHe62bsWQ+rhEXrCEQvzFXHct //8VtvKIKYaIKNG0NjrWBh3epkMYv8Prz340XnMaBN77amjfaJ57bwcfW8hVqeGsBHtv nIfbodQ2woiWRPFsHZ77r308gOoTljn8WFlmtpNG7LfC1zBn51SClyF3vUH06IBrQhWr oBHES8npcIkd1ADXrdctNhfW4TmxJByQVrCX7+LH9GJW1RhvrC87w7wO2Xj/pxDK/FI6 YGc4sIYFl8Z0WYYJhlA2n+CijbV0p+oxstgYwu2W6bOYnNhbcLg0Xb/VPf28SfYD4YNA +nqw== 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=REPPJg2JOahjX4J1CumWD7b7ouTGdk1SL3vHEtRJv3I=; b=xQxsveP3M67xbnlLwfv+AZAun0aT/7NjI38OxcfoXz5EbpPossf2T3YvAt0aQsPq85 QoMlD6DPqD75jaqW6wQjIlYmWNQUFvIsbAYxPpdlhNb4GMaLzNor4UFoB2PcdlBcJGzy kjM4uB/4BudXWTKuvNwaoSTuz+tv7gcgQuX/DkEMJ7fEN7uk9fNtCa/foMB9TYQjbVyx R2MM09gpX8sUQiN/k8a7UIEUSb2yX/5nSBvuVpmVL0PZF0FCgu+ADnBPoXvAHfc4TLQi 94ZJ5r0S9IvbHB2u+sJKFB/lvKZ8K5thYFvvFX1f0ATXmu58A0H4yfyJTsEqMxHcUT+9 KJIw== X-Gm-Message-State: AOAM530gCqVrEHC2eX3hecufajwQWjWMRQRDVzU6cqSDt5Kvb4BJThL4 zoOfxg//eKMtc2yshrEwg4E+hxo714Y= X-Google-Smtp-Source: ABdhPJwGJmE1c7jv0DmRaPPlsImdlrSYAXnOjk1DjByS3U+EaZHsDKk4ECDuVzPsF/JxUjN8NobIjA== X-Received: by 2002:a05:620a:278c:: with SMTP id g12mr951745qkp.729.1642039393001; Wed, 12 Jan 2022 18:03:13 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id v1sm1045961qtc.95.2022.01.12.18.03.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:03:12 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:02:26 -0300 Message-Id: <20220113020242.661-14-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 193/281] atrac9: 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/atrac9dec.c | 4 ++-- libavcodec/atrac9tab.h | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c index 1063044815..b13235cfb9 100644 --- a/libavcodec/atrac9dec.c +++ b/libavcodec/atrac9dec.c @@ -938,8 +938,8 @@ static av_cold int atrac9_decode_init(AVCodecContext *avctx) } s->block_config = &at9_block_layout[block_config_idx]; - avctx->channel_layout = s->block_config->channel_layout; - avctx->channels = av_get_channel_layout_nb_channels(avctx->channel_layout); + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout = s->block_config->channel_layout; avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; if (get_bits1(&gb)) { diff --git a/libavcodec/atrac9tab.h b/libavcodec/atrac9tab.h index b169035aad..bdd051221e 100644 --- a/libavcodec/atrac9tab.h +++ b/libavcodec/atrac9tab.h @@ -33,7 +33,7 @@ enum ATRAC9BlockType { }; typedef struct ATRAC9BlockConfig { - uint64_t channel_layout; + AVChannelLayout channel_layout; enum ATRAC9BlockType type[5]; int plane_map[5][2]; int count; @@ -41,25 +41,25 @@ typedef struct ATRAC9BlockConfig { static const ATRAC9BlockConfig at9_block_layout[] = { { /* Mono */ - .channel_layout = AV_CH_LAYOUT_MONO, + .channel_layout = AV_CHANNEL_LAYOUT_MONO, .type = { ATRAC9_BLOCK_TYPE_SCE, }, .count = 1, }, { /* Dual Mono */ - .channel_layout = AV_CH_LAYOUT_STEREO, + .channel_layout = AV_CHANNEL_LAYOUT_STEREO, .type = { ATRAC9_BLOCK_TYPE_SCE, ATRAC9_BLOCK_TYPE_SCE, }, .plane_map = { { 0 }, { 1 }, }, .count = 2, }, { /* Stereo */ - .channel_layout = AV_CH_LAYOUT_STEREO, + .channel_layout = AV_CHANNEL_LAYOUT_STEREO, .type = { ATRAC9_BLOCK_TYPE_CPE, }, .plane_map = { { 0, 1 }, }, .count = 1, }, { /* 5.1 */ - .channel_layout = AV_CH_LAYOUT_5POINT1, + .channel_layout = AV_CHANNEL_LAYOUT_5POINT1, .type = { ATRAC9_BLOCK_TYPE_CPE, ATRAC9_BLOCK_TYPE_SCE, ATRAC9_BLOCK_TYPE_LFE, @@ -68,7 +68,7 @@ static const ATRAC9BlockConfig at9_block_layout[] = { .count = 4, }, { /* 7.1 */ - .channel_layout = AV_CH_LAYOUT_7POINT1, + .channel_layout = AV_CHANNEL_LAYOUT_7POINT1, .type = { ATRAC9_BLOCK_TYPE_CPE, ATRAC9_BLOCK_TYPE_SCE, ATRAC9_BLOCK_TYPE_LFE, @@ -78,7 +78,7 @@ static const ATRAC9BlockConfig at9_block_layout[] = { .count = 5, }, { /* Quad */ - .channel_layout = AV_CH_LAYOUT_QUAD, + .channel_layout = AV_CHANNEL_LAYOUT_QUAD, .type = { ATRAC9_BLOCK_TYPE_CPE, ATRAC9_BLOCK_TYPE_CPE, }, .plane_map = { { 0, 1 }, { 2, 3 }, }, -- 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".