From patchwork Thu Jan 13 01:50:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33363 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp23787iog; Wed, 12 Jan 2022 18:10:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJyiUlgyir49lEzq78lvjT6RaUU+S1hwTFDJeNUHxn6H5lokOtBXCqyiz6cwxam61ylxfoPU X-Received: by 2002:a17:906:7942:: with SMTP id l2mr2004097ejo.730.1642039815881; Wed, 12 Jan 2022 18:10:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039815; cv=none; d=google.com; s=arc-20160816; b=xdi06tz8Ystk+E8tjxRhetm7Q8ywphHiPCCmlzPXUME60RJLJ38WScaQ/SWuc/i8tb skoEAJnybld0hCuOLHRBpWF7RPOBCYE4hpF/CEmO4mBZ7cm4teauP/AsSyLYJNcjLwsI IZ6Tr578UQzyICO53YV7ZjRuiV7d+w5qAYZI4raplcFcgwbIXNhoB8tcl6Xe94nL1hA1 GQ/ka6/QL1CVimH/bBxD2RCTxMXK1bKEyS3g5DbWOBe1Cu6fgkD2qbALaoALiimldEG0 NktUBpGL5iVeoyaLmHyBfNYAtPaxgSi4u07tLMO/SqkpiywFVEh+w5plx5Qwu5cqQ4MO 1Olg== 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=xxES3koo2uGJwKGzY69lEX2Az3uPUCNfxnnQ4PYOBIA=; b=w45V1+YJ+FUjhaiDhIonxhGXbHchi8is21EwHNy0i6ISrngowWK/kDvGIZvLyvMzQg 59OqPT6EgBPDKdfZUlyls/HmWIqYugzkEX04yT9/2H5t8O5euPtKBMPha781YDFOq4/3 k8n/t8JILFHAwD79/jTW8rCk3Q+GCbwK5hfNHe3WYQmruHqWvTUnGT5x7slSIFGN9Ngo LwVAKfKf2NDlydyz4sxAWR527gA2fV0bHRViCSxSrEzshzhwDidldaIgyLQkfyPZ0A3P SpzhVElR4EVqrWsGZqC2wYoPtyuR4Hopcpu0bQfjYzKUHuqYo4/ir9WCpvCTngb7VVfD KTTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=lKivSq1j; 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 o16si768776edt.172.2022.01.12.18.10.15; Wed, 12 Jan 2022 18:10:15 -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=lKivSq1j; 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 7F16D68B208; Thu, 13 Jan 2022 03:53:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 08EE568B12D for ; Thu, 13 Jan 2022 03:53:42 +0200 (EET) Received: by mail-qk1-f174.google.com with SMTP id t66so5561390qkb.4 for ; Wed, 12 Jan 2022 17:53:42 -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=PkyMNk6Ft0vbW/jIDaHDjvKsvpUpRPAX5TBRJmpApXw=; b=lKivSq1jVYglE1CcukA2uQ6uC65J/hhtH9632fhAP5xvsiQAMssFOBxEnpblWzW6Fh uvrDJZ6XcrqRvjQ+yTVtKu3lQU0cZUv4Jf7iJFoztgtRenT+dsBk9pxTlKkH+Tpfq/mM ufQtGAlgzP2m4EvdJLrPEp9JCtNvG2eR8bm7y0v4WndNLC4/xp4AeW5j49dGpVujO4TE jcSiWYU272YqOmiaj0kuL8LoNSKDx6ftOmmuPLeDuegApVN73B4pYGveofVvBkgS3Upi BbbeISTRc6GQIExJayHTzhUf3IvE0bK8s/eRrq0htpgRuruW9prlI5pUwEYdyFo02aWE h1eQ== 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=PkyMNk6Ft0vbW/jIDaHDjvKsvpUpRPAX5TBRJmpApXw=; b=FXjgWzsh2Qu8f7IIIJ8Bmyfj6XGnwJZCArY+DWYH7eJUIspp2vvFJFCUgeQImlybK8 X3zTe00x7v39KTILnLyhJd7GCBU+vPHE/hAIpfwZSNTymElEdJFo3Ga26aoUqn4yBcPV 0KseS37dowlS2yUGvo7jmXdZQhdQC+sBRcJxbNuklSUPjY9yMFDyMVwvLQPTGgb4oRKv QtsJ/ljHbnnEhD27kCDjXcEakMhc/7tYMZNKkR66vGDsEMcD7jKF3l8a7xYbBevtNK7d GzaSl1MZxYNn/3TUXnaqUPr20HFYoJvlt4btie64mlQk5j7toyP233jDk9rR4h5noBc/ v84w== X-Gm-Message-State: AOAM530w5ayOEm+yDT/Gl58KvxlgFoS2KFN2GBNYyo+dXkV4w65QQBYx /RNPZ/Gxf02tMIvpBZR7g/osQ0T1Qzc= X-Received: by 2002:a05:620a:1098:: with SMTP id g24mr1159044qkk.123.1642038821605; Wed, 12 Jan 2022 17:53:41 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:41 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:46 -0300 Message-Id: <20220113015101.4-85-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 084/281] jack: port 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: kpPyeCTmXOu8 From: Anton Khirnov Signed-off-by: James Almer --- libavdevice/jack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavdevice/jack.c b/libavdevice/jack.c index 0d5465e407..53ce029dfd 100644 --- a/libavdevice/jack.c +++ b/libavdevice/jack.c @@ -255,7 +255,8 @@ static int audio_read_header(AVFormatContext *context) stream->codecpar->codec_id = AV_CODEC_ID_PCM_F32LE; #endif stream->codecpar->sample_rate = self->sample_rate; - stream->codecpar->channels = self->nports; + stream->codecpar->ch_layout.nb_channels = self->nports; + stream->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; avpriv_set_pts_info(stream, 64, 1, 1000000); /* 64 bits pts in us */ return 0;