From patchwork Thu Jan 13 01:50:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33357 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp22058iog; Wed, 12 Jan 2022 18:07:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWSRsdFPFKlPoZQeaN1gysbnQrrtK9Vjh8pl2XZbItfZOIftShCzkYakDv4DIng5NtdQK8 X-Received: by 2002:a50:d492:: with SMTP id s18mr2273170edi.145.1642039663169; Wed, 12 Jan 2022 18:07:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039663; cv=none; d=google.com; s=arc-20160816; b=ZFvjct95z0YPveLi823+4sb17948frou9fLliFsFj+bmBP9IjTGJT53clq0irxJv0A hhZoxtllAHDsjKQ68bNLPTQT4jzuhMUuCGWu9r9QSW2zichriJ2ENGgB6JHZ8wcNIVwT MXs2QoqkvwoULZPhDiC0Q89yaGOcJessZ5X7s+zjCH15JxdxHBVLG4Geu7WcgQSAmxnV WjIhMjTCuACUCZymPblsNUy7GJj1CcP8UycbLm57sJ9X2T4q3tcZ95HBKmaOyxZT1e6h +nx5P4INFJBMDh7JCeyhmrwBcb1x9W0Cl2Y62nX7xIUz/UGpPMsfyqHbbAXf9FPgjzBA v3Qg== 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=ypzp1skXQTTCdX8OKqch/Kez5GNMLi3S+2j+P0o9MDc=; b=wfAtox8hTcVoPdWXyiwIAaI0A8iLzZFE7hQluLUMS5kPLLiXq59m3tGwDi1S5ZOukt QgiqtDJAGU79avjR6GU1lXh+IP6+WGtYcvAGRTJpfQ7rVQk31Ln748GREwgbIF4gBzmR chwdM1dLGf6I11khvv52tVda9ZXSl05SzlkWDvHVCNm3thv8Hq7DK3rHuTYb2WQMUECO exBb7QgR46wTjw4NgOOvj9i3jeYvkJ/kzk+hFKsXmMlBJqZadatVyVWydmJkf5eKh8fj 9fYNIir9cxF5QFAdRcB516mc3Uo5sAi58NUF465KBTrAR1kxhZcNV4Rcq7K0fDaFtpV9 +Mtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=bDG6hXJr; 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 gg1si739372ejb.166.2022.01.12.18.07.42; Wed, 12 Jan 2022 18:07:43 -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=bDG6hXJr; 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 311E768B0C2; Thu, 13 Jan 2022 03:53:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA04D68B1B7 for ; Thu, 13 Jan 2022 03:53:29 +0200 (EET) Received: by mail-qv1-f49.google.com with SMTP id t7so5147894qvj.0 for ; Wed, 12 Jan 2022 17:53:29 -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=ycLIY+RH6c2EqJanObgaufvIDahn6MAyCl2VpSBwX2o=; b=bDG6hXJreYwftewRQhtl2G4Je1CieJdGV7XiHmORrVQaPphwmE5c0aEJGjALdf0Oi4 bI22elaE6KCUBloPegErdxwD8R0yln0MAoEGFn2iRltbMOVmd9fTqRTYGt4camGFKdnT gwu1R9PtvP4t6Ej9sJTTV4145NZdrjh0Sd0C9IyQRhW1abG7bhxshr2+IokXB3/3aj80 dXe/hSV5FwmSkeLp9ec9dmNmQ6Ysgz3ZZhyQnHG7iPEj4pSBiBixYjPO2K4niIPoRc5j ebRe6RzBa8Ndj2jJczJiS+aMWLMYDKgyvC6x+tR62VE2IjFOUIJjqI3lztOUNtzREDuO F2NA== 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=ycLIY+RH6c2EqJanObgaufvIDahn6MAyCl2VpSBwX2o=; b=H6or0Z9zq99UjWBG7b7vDZuf2GJp00FjS7xs1QkWFd7eeFmluXZtBblW1mYAfXFDUB R+BCdPqO9CchjIqcv8Jh3bPsXB/m7X/z7W9X1B7AgClDV8jNk1COxfCif19HGJru4qyb XSFonTNxcWcSipq4MpCCoAzaMll8G6ke7v6LEmMFhlUQf2wDtEp65SrFo9UkJYuL0VUa PkRDdp6AlH4ojliG8VV+yhLc6oopRmhjC6KZSn6LQIupkziLGCp5Ob11pEBQJXESK00+ Ufklr12C0Rq70LpPNiZebhgmQfj9PgvKIpG0BaQUMv6LCpsgRwBM41WHEl5UR5U1A3Ho NhLQ== X-Gm-Message-State: AOAM533k2OzMmASSsEGiZNgx8h3gv7YNGC8PHjAM5X4IIxFXnAtB0LNe LBL9Z/5sD+V8eLzUshiUg55pBAggW30= X-Received: by 2002:a05:6214:1c42:: with SMTP id if2mr2119693qvb.17.1642038808326; Wed, 12 Jan 2022 17:53:28 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:28 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:35 -0300 Message-Id: <20220113015101.4-74-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 073/281] hcom: 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: LAYIH14olCac From: Anton Khirnov Signed-off-by: James Almer --- libavformat/hcom.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/hcom.c b/libavformat/hcom.c index b7fb7314c8..579f0b707e 100644 --- a/libavformat/hcom.c +++ b/libavformat/hcom.c @@ -62,7 +62,8 @@ static int hcom_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - st->codecpar->channels = 1; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 1; st->codecpar->sample_rate = 22050 / divisor; st->codecpar->codec_id = AV_CODEC_ID_HCOM; st->codecpar->bits_per_coded_sample = 8;