From patchwork Thu Jan 13 02:00:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33433 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp33634iog; Wed, 12 Jan 2022 18:26:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJwMUSYB9hRTVtt8xHh4sdyz6IL4MxuFuNG/7g6A6gD2Rt8YCAlpWodKvJwWxbjz+oPc9/wf X-Received: by 2002:a50:fe90:: with SMTP id d16mr2277589edt.361.1642040798819; Wed, 12 Jan 2022 18:26:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040798; cv=none; d=google.com; s=arc-20160816; b=OiPwHZmgL96ut678NABBfLOyLMvqDm/zKodVCFY3j5+AvFWLul7jOF7CsVipEnxhee vziFkap4J+o6DiT8ClxYoGT658sHy0jF5GnkBG+IgYoO7cL8AqhOwET3f+lP/MM+lJi+ sdwWjPPjYsaNPRYO9g5e6imR7LpR5mWGXz8GPd5FN21u0r7Y2bGE4juu8fcGFVDLwsI5 Mfr3pROw4RabHc1Y60GmkblG/Hkbj9COlcTaCfbTVkqrr7STPBKSjwG/v2jJMXtI1S1O DLLzNkYWY5EzkO+5p5fNOPXqnVtGeUAVsqhM/EZmltxh7DfUPyn3teK4yRF7TfJzRxbR puKw== 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=a2GnDfivrGZHf2bzpRtH0qbfniHtK01uvi6vDYqNvek=; b=P+Fh0/EXsUYreGjtf+7hdK2nA8Cq+vSqVCz8bN5dAAkhGgKaLF7XiwxaSXwsxdLczi 6nns8P3OQIEnTOGNjdJ3IXI4pOJ5Bz8Z9T0ciAJR8xeBE3pW+NNXU2A4hh3fgCkdwyt9 h8XzVFTIuYRArvQBH5mPIafPav715+p7a5wN3iYJ0WOdr1Jh7Bj/k0pKZToSRDGrzc2+ cyDx0Ed5d/aghyDeB09stUq7LnxN3+XL0y/kv/SVBcYBmffnS70ehNlAv9LL6429aGum hm+NvO3domHV+8k1MqKoqqvJX3FoRXCaMCsb3DiGS6UeA4GYmgAYEg5InpAXfrqRiJKQ FRjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="Yx+jM2D/"; 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 sa19si796093ejc.691.2022.01.12.18.26.38; Wed, 12 Jan 2022 18:26:38 -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="Yx+jM2D/"; 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 D194568B487; Thu, 13 Jan 2022 04:01:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B41E868B449 for ; Thu, 13 Jan 2022 04:01:12 +0200 (EET) Received: by mail-qk1-f178.google.com with SMTP id t66so5578718qkb.4 for ; Wed, 12 Jan 2022 18:01:12 -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=to1Iur60gszvzIr2+X6k03rxHNtQ3I3Fbb8xPmKgF+o=; b=Yx+jM2D/SwHVAFPiIDqouraEaP3NCI8soEWNlLY6eBNm775+5iKH9Tw186Y12iBt/u imUsVhDlQuVEPDr8SfsMZIpbXj7bicWV8l7teNntiHtcmtD+7bM0W8iKbJq1yov1DVbT c9Zjya87/knoH016H0J5jyJ6qkEqaRquc61gj3ZgjN/JDqEuCwp0Ck3MxxYl1/CsFq5Z 3llOfXFQiXeRiDOzAsCwdkZKKt+8uBTsqK/m0bFSJDG+oUq+zMEahX+R3aMMbcUWaI12 YmtF4ShfbTonosRRCK0dBoNtilPTrbcG7rVWJjJXPoXjbUpOcYeUWTjLvg+0hMWImNYe l2RA== 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=to1Iur60gszvzIr2+X6k03rxHNtQ3I3Fbb8xPmKgF+o=; b=3dOdKjVa8ArW5Gv5WeFdDMyKIEl51sTRhRVfRBRWvGIEcMyGZ0XRl0XvvMHamglOgP NRGPNNplS+oOTGrDSaenhbdDthKgbbZs7IkGfxwIl+ZXlNidX0x6MNd+a8g7vX5lfWV3 LCKMs1jblI1eHkikIweNJCn7+rMuFrR2t3DuC3I0A391UWGxOVNkzr1adK/5UvPMyJUh K221Z1z+ZMg0xPh5ypiXVkeMJDzjeDxg/zRjFXtD54qUr3M8nTWtawtXOqwvvlx3ZHsZ XV/kCh0eZfYKaWhepy3stxpXtVNkg0mQ5msSpDvY7Ottck05RLyrGUKs3fH8e+wySM3d o4gQ== X-Gm-Message-State: AOAM532u6oXJAtAc+BEsDDKgGhPpd0jw7pH59m7Hd9dcQbuO25RA2UX3 mH5y6OkZVSedmYT7+80kG9ykMcx6uI8= X-Received: by 2002:a05:620a:2956:: with SMTP id n22mr1786944qkp.133.1642039271139; Wed, 12 Jan 2022 18:01:11 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:10 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:02 -0300 Message-Id: <20220113020026.590-7-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 155/281] tak: 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: kHWHwbKtAFxr From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/takdec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/takdec.c b/libavformat/takdec.c index cc1f049512..51e4679fd1 100644 --- a/libavformat/takdec.c +++ b/libavformat/takdec.c @@ -152,9 +152,12 @@ static int tak_read_header(AVFormatContext *s) st->duration = ti.samples; st->codecpar->bits_per_coded_sample = ti.bps; if (ti.ch_layout) - st->codecpar->channel_layout = ti.ch_layout; + av_channel_layout_from_mask(&st->codecpar->ch_layout, ti.ch_layout); + else { + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = ti.channels; + } st->codecpar->sample_rate = ti.sample_rate; - st->codecpar->channels = ti.channels; st->start_time = 0; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); st->codecpar->extradata = buffer;