From patchwork Thu Jan 13 02:00:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33434 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp33754iog; Wed, 12 Jan 2022 18:26:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJzcZYsDq9SoPnIiesl7h8bz6rIRUHiMk0zS8mzRwK4AP5rz4Jk66vjSxyuIUGauJK6Jq1Ha X-Received: by 2002:a17:907:9622:: with SMTP id gb34mr1875804ejc.355.1642040810904; Wed, 12 Jan 2022 18:26:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040810; cv=none; d=google.com; s=arc-20160816; b=yYwbF84GAKSRQ3O9McQ17vkWbkTNR4Bh+GNoiJvPEGhCDRF42vy+PfYrVnchlHsNNI y8MHzgptNjK/nelC9Qerowmm6zZqnkrmm3KMjjRpLr8XHE4YBWzgJJtYpz/ZUmTEEvb7 ArM+f1VHlbNkaq6Q0L/QgujrxGXBDL1issoN7O3OB5JnnfYGxbweS6/sKdxIfX0JdBwz Mv6h/NNjKeZoY403eAUI9tfnYhi9clmVK7tAW5CCzN0qV8BTFLGRRtl+0d/J/nbmZIcP fqRul2UsAgjHQ1uIkSkVuRfjS+HLmzE14pYk+57n9q5cBa1fILNE2srPz4b7tMv7nEo1 K5/g== 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=oQa5+sh+Tm0IY0o9ppAmfPWuJ8lWH7EZa1TRAjDGhdo=; b=EXYE6qS/TliTWGh6Mp8U73zG8a3fsvzBKecns/tgytZZdyLMpnUp9w1w6yQJZUSax2 ROq3pIYNJKz2RK43lYz/QpgPBJJknasoN/5YWTaST8a0w9TDZ/lFi2r1QVqpbPIEfmbA 21Ti0fTUQ/bmPMtDR4akhXB2dJNXaP8AwGtrnuhCMtQLO2Avxyi/D3QT9i7ibJWvXpeh yS/zHZUfSsebguXIZSq90ZOww8kNTJlETwxzEBeyuGkag0ZylPA2YDXLitPhdU1FJdfk DSesjJEAnKaalYGCbe12x5PAtcD8PJw3Gbk6Zhh0XhbapnvJwkjPaZ3+qF0BXaaPzVGX olzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KDhy3ZH+; 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 m21si834649edv.367.2022.01.12.18.26.50; Wed, 12 Jan 2022 18:26:50 -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=KDhy3ZH+; 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 B1C0168B490; Thu, 13 Jan 2022 04:01:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF70368B46E for ; Thu, 13 Jan 2022 04:01:13 +0200 (EET) Received: by mail-qv1-f46.google.com with SMTP id p12so5099551qvj.6 for ; Wed, 12 Jan 2022 18:01:13 -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=Cwnie8poJYu1j/9SvXeEzG+GG7LLK2gEB0ovCCXDsT8=; b=KDhy3ZH+/1m8Qzt6pkXo+DeRqVDhg53Fveo2O6tFtt+qKPzkbnMIs/swNZ2r6GlId+ u/fuG6foZxfpMsmfA946jMcSNZTCd1HJMK33Itz5U0cDLLjVLfsVksVsliUj4v2TKhVV ZWNME8FJRXU2ouEWS6sSSpBBjYnERo6fjvQ42ZGVg4M7h/rGybChaUSEnBIWFZ5CERWu SZpjZ1+iPdRbvHPE30NHKAZWitGOyvB9tHThDb+PJWDDTK2Ot9sNizcrMkm3Ij4ulBBy bRGDM6LwNR6IlfV4SOKyx+mF4958v8MajA/czw0XTkXWiU+GZlY6Odn0diN6vEDWkM9F dhEw== 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=Cwnie8poJYu1j/9SvXeEzG+GG7LLK2gEB0ovCCXDsT8=; b=4DV3oSKZvHaJNJ7hm8cyj+6hZaoCme+EodNN3nIk6b1PlJa3GRp+B12CABOrqHm0cB 9scivSmvvz9Gul54lGhzXu0qDL3B3FDGFvaV39ByWysPSRHSyodvakw9ADAzeXgG2LOP YUm6gV6dE9dLfO7rjSdGVHJOgyOq5gEFNxWaGQ+h5NTgBUSCUo5xsqhMq/Z/fJigPgy9 iDZF2wTLqcwhnT9P11RDpTQdpQFcBSYKkPGnKAH3UlmefyXBxyZjdGJwYRuvO6riI+VG ogpYWJpJ09IMEyUdXZqij3ZtV4YH0mNyB9tf74ytajGODyHltAswolJucmwGL00/RzeF fWVA== X-Gm-Message-State: AOAM532XJrdmRiL5y92F1BuUn7H+VOgooJ4rMjkSgHLOCDLQNV2zRiBg 8m6HvcD8o1ebw5xWrldrql8vAmJr5kU= X-Received: by 2002:ad4:574f:: with SMTP id q15mr2350141qvx.94.1642039272362; Wed, 12 Jan 2022 18:01:12 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:12 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:03 -0300 Message-Id: <20220113020026.590-8-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 156/281] thp: 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: YA9q36wjyy4V From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/thp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/thp.c b/libavformat/thp.c index 7103cf4f8a..2dd8b4d618 100644 --- a/libavformat/thp.c +++ b/libavformat/thp.c @@ -142,7 +142,8 @@ static int thp_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_THP; st->codecpar->codec_tag = 0; /* no fourcc */ - st->codecpar->channels = avio_rb32(pb); /* numChannels. */ + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_rb32(pb); st->codecpar->sample_rate = avio_rb32(pb); /* Frequency. */ st->duration = avio_rb32(pb);