From patchwork Wed Dec 8 01:06:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 32147 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7045200iog; Tue, 7 Dec 2021 17:09:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJwWVHhEVWXXbfoFJQFZH1M84pN9Q2kehZz92rDF4lG+KxPNB/d8lLJZKx1eNjaLQG6Fijty X-Received: by 2002:a17:907:3f96:: with SMTP id hr22mr3504936ejc.492.1638925799516; Tue, 07 Dec 2021 17:09:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638925799; cv=none; d=google.com; s=arc-20160816; b=hBoczl1uHRpIyAb+Jb22dvK38merBoe6KvGxmstTjXb3rL4+ffiRWV+yR98+9WfBE+ viSmT2//gZ0XgLuD3JOpxG4MQe5ivbTUC/FIE39IFUgt2prMMP62PbExatmiCeKKqXBF p02A8UjnJtjqytbzvqOKzR7OiOCWkDeSE0HPKzXbWRAJYzZyhSDjaZ5LHd5Q3xR0haCL 7Q89oDcjsWZTdTDFBsropriuumYG24INo3dyYbnwguSTnuvzl6IFWD7Jm2N11eFCceU5 D5t+9TQOOxuLBJtOeA6eGjaePxMM3el2WVC4QV+4UecV/kpHYV2d84/jWC6nijFK3dtb OIUA== 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=jYnPIOvUwf5tJ9+LUVe5m0GOqyWyQB6gBTvzI/AB3wM=; b=b/yVmo/VqyeBFZpHrblk7h7K4B4ZV19/JE5zFq/O9nOO3ItNJUuYSskQP5UPocynEP //AeaAYyGHvAG3n3ho2PNiTcPgTXHMZPoTBddpQyRoarRYCE/UjEpLU0vsBh3or8h68X /zOoZy/83SPXQ9GOHgPj++SDFT37/y6yeH4SLBl/U30e0cZfCfCqnt7J0RG9adEI8TWB cEI64n3xulOGWQtNJRsiKGWiGjzGZE2rIq4a7imYoCIT4i3zFQl0eBdWno32THwofgRt iZMf69QzHVYJqtca1XIjbMB2tlYrqeZzA9c8pLJQtNf2WWA9oncoUNBYvOgM1U2igLAv EgIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VSCCs2zY; 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 ds8si2742588ejc.494.2021.12.07.17.09.59; Tue, 07 Dec 2021 17:09:59 -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=VSCCs2zY; 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 EC6D568A7AD; Wed, 8 Dec 2021 03:07:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f170.google.com (mail-vk1-f170.google.com [209.85.221.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC3C868AEA9 for ; Wed, 8 Dec 2021 03:07:45 +0200 (EET) Received: by mail-vk1-f170.google.com with SMTP id 188so560454vku.8 for ; Tue, 07 Dec 2021 17:07:45 -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=nOevSgymdots+DtYaPcqX2wL+D2xwSHrMGGO5rjYl5A=; b=VSCCs2zYh6w0vPK4Ro6XY+0037h7V4BVi3Lo8sv6colUAr7Ydu4kRqjYMaxL0cdXOE 8d/dA5EHLcB77tla0f0Q7nI8nCaH9gcgIpdB6oVYJHrSNq7RLtJERFIa6iAYnxWURdec Qq6Uuc3rwkQBJijdi578qSEtjhJavAmcW6d2EFWV6b7mAym7QOHYJgpJIVoWqYElFkh7 L4Nklapf4QIi2A3ce/mN4CSKlKBbTasIpKrYd/uoe78eYQ0+SKaWBiV/4fe9PGXSWrHr igeDuSISD50srwopic3ZHuj2TTRS9+24EiujpeMqiATta6xwa/ZYmrv2f9IeCR0lZxxB xuIA== 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=nOevSgymdots+DtYaPcqX2wL+D2xwSHrMGGO5rjYl5A=; b=pSgXEO4JaGn57f1A5fexrGAulq5NuIwuds2wmh+g/XnYbJ29QkoV6FhwF1kouj2tju K8F6eGs/IKJfBlYpmb+MjEaA3sduBCuDH9mHR76JmjxrD9c8mDI9hHjvPkIW0tKRraY6 vxcnV540GavAxI0dBuw+6E3bh5GToY1yaUG/ullRUJrADqLellyqmdeGaAvNEqxLDh/F jZ+VUrLsr/M7qdeLmADDLubP8PX4Fe3NfI6RLEyaqeEI+oGzllKQbYIva+BXfijxjfKI +tJFD6OqpFIn53+2Lma1n+QyoAdzcI4azieKIoTvlxVZ3n2PNIA12JBc62qnpC1dcgUi CE3A== X-Gm-Message-State: AOAM531bEo2u8U4L2x3YXOlgrcxdwinMlWDPWuqkAdh3k8g3sZGBevSq AAtrz6CADbbrdHJt7R6KGTwpHamexEbgUqcy X-Received: by 2002:a1f:e605:: with SMTP id d5mr56713298vkh.39.1638925664153; Tue, 07 Dec 2021 17:07:44 -0800 (PST) Received: from localhost.localdomain ([181.170.250.138]) by smtp.gmail.com with ESMTPSA id b8sm949898vsl.19.2021.12.07.17.07.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 17:07:43 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Dec 2021 22:06:29 -0300 Message-Id: <20211208010649.381-14-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211208010649.381-1-jamrial@gmail.com> References: <20211208010649.381-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 013/279] ace: 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: U797KCW+xi/8 Signed-off-by: James Almer --- libavformat/acedec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/acedec.c b/libavformat/acedec.c index a52a0f0e54..74128e0a6a 100644 --- a/libavformat/acedec.c +++ b/libavformat/acedec.c @@ -74,7 +74,8 @@ static int ace_read_header(AVFormatContext *s) st->start_time = 0; par = st->codecpar; par->codec_type = AVMEDIA_TYPE_AUDIO; - par->channels = nb_channels; + par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + par->ch_layout.nb_channels = nb_channels; par->sample_rate = rate; par->block_align = (codec == 4 ? 0x60 : codec == 5 ? 0x98 : 0xC0) * nb_channels; st->duration = (size / par->block_align) * 1024LL; @@ -85,7 +86,7 @@ static int ace_read_header(AVFormatContext *s) return ret; AV_WL16(st->codecpar->extradata, 1); - AV_WL16(st->codecpar->extradata+2, 2048 * par->channels); + AV_WL16(st->codecpar->extradata+2, 2048 * nb_channels); AV_WL16(st->codecpar->extradata+4, 0); AV_WL16(st->codecpar->extradata+6, codec == 4 ? 1 : 0); AV_WL16(st->codecpar->extradata+8, codec == 4 ? 1 : 0);