From patchwork Thu Jan 13 01:50:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33367 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp24416iog; Wed, 12 Jan 2022 18:11:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJwBuwk4ARknFOsTAbrYZRBv51mIlU3ee6Z27tqUJ4xY2ksmorAXxOp9BDJfi1QDfyOnUKyI X-Received: by 2002:a17:907:97c7:: with SMTP id js7mr1872974ejc.84.1642039869236; Wed, 12 Jan 2022 18:11:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039869; cv=none; d=google.com; s=arc-20160816; b=hekhPSMGVmkMzwIn/Rv2kDE7ORQsg6BQLYCVfqg1QC2hj6AKLmSEDrXERIiGj6wpcc USa/f/tMHgzTZ5pPJEBbbaGDHBJKtk+HyrLUSyY9JnoGcEG9ikuFC8PKBXRW3++I9/di AjQVhbi7QIRM+nwOD5HUIPls/yiHnK3ljqNeHznKT8zGhUtGgEkGWCCN7GpF/vTpq1PS MMyeRT7L3Oas32F0ON6CpBeV38RqAWYsGEvTVAxMLgp5icMv9pDu+tYLf/ixXQ7nFUSL vTNcMS2mN3X1ELQcvBefsuFNfBaYRjV0zMQrLyqynrnpPTrAwdCBVuu0K8fF4MrLdZLL 2SbQ== 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=u0EjDs4mx9vRpNOdq4ThLndfONRcJSAO+geM00iY0HA=; b=YkLRJkJflp37UQwNU2JoOy+tBt1U/QPtP1manO5aUab1QZ9xbS+DBnjrjW3QrC1tnI Q0r16YgFh6VsedUJqZwe1M8WDpY7NWwEGhKHW869U3GrLz/olM4F46zl9Mk8HlBceOjM ETKuIism/J8KTBzf1rDy+NbJGIwKK34EN4khVT/izTDQg8nQ81zGp2XQvnCeruo8BRW7 1kHrKl9G8wmJa2eZyYtTObtoIAmhBlYw+ChbDMjGZ8rV57f5LxLkXAk2Hb6UmVoD1T4w kVbGmhNDSFMtzSgXDcC039HXRl3pZPMHcNW9iXnIhIwFDzmauDa5LCLg+6SanGWr2eoI yeVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=YcadR+JE; 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 b9si917888ede.319.2022.01.12.18.11.08; Wed, 12 Jan 2022 18:11:09 -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=YcadR+JE; 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 1118068B231; Thu, 13 Jan 2022 03:53:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BFB2B68B210 for ; Thu, 13 Jan 2022 03:53:47 +0200 (EET) Received: by mail-qt1-f181.google.com with SMTP id v7so5307665qtw.13 for ; Wed, 12 Jan 2022 17:53:47 -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=0re76Q3781gwVIWTpiwow51HsY6qqa6G6OUdyeIhjx8=; b=YcadR+JEU9e61qjqh1zgtZQjvf7K0z+WUQHjEQcxQ5x/y87yzxp8bWFpB0i6Zwz7AC H3riDAMfz/ii7gNmHlAOasCJ3SA2lEBrL/9fRdBbKRPGS0YdHtP6g0WAx4n+9hddtIy1 oPzBEuD0vNkJN7an/h+lXdO3ImJqoV3A5YpMxjNW6CzvVs+F141RHWujoal8E64s/YJ6 TfYBGFQqIc0Uv/uAycZgNiUdyyNuRA5b1cGD9MvBUqeQPEZsphMOHoJqAa2zX9Fwl0/+ iapjeRaprMQDB6znRDFEIPpi1wp4b6bPovR+bv9XXfuFyZPJMPofIi/68kacTa2GgFeS u7HQ== 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=0re76Q3781gwVIWTpiwow51HsY6qqa6G6OUdyeIhjx8=; b=cHGMPhFOaoKUb/fpXEFzoprCJC6mNfPwTniH2G0HxQ7Cg3ZwLjo9L8pIjD7Na+hmQu 7Pu9OhjE6JQNW8K0AIJewxXTmTA3ZeBlL8IUAasiJ2Hua0WprdC+URKUbCjLXaUf7/sz G6LvllIkL7VVOiG0jOmyoXJdFAi3Q1Q6lXsEv6zoAWvqQ2eguRc2LOXa6eVyzhi51m+F z2BHzPP1a7DJWWLi3IrgNsTETfjv1trwCoQomvgumh6/b0N5L9BSVEIFJDfqkGCJx7y5 ATkgODO5D5cQlRlgoUwxUd1OB0/ZgQM65P4hwPtSvTbDs3bPukfTKhZPWQz8eqFmtkKV xIeA== X-Gm-Message-State: AOAM5307L5942VkJis1POFTu4epElha8xxxR22ijWi984e2nCHETHnRU hrNm2o9txX2LYMNmsGkYxDZMcMddH1U= X-Received: by 2002:ac8:57c8:: with SMTP id w8mr1964085qta.402.1642038826406; Wed, 12 Jan 2022 17:53:46 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:46 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:50 -0300 Message-Id: <20220113015101.4-89-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 088/281] libcdio: 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: l85XM4yEg8X8 From: Anton Khirnov Signed-off-by: James Almer --- libavdevice/libcdio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c index 623878fe7f..4417523c57 100644 --- a/libavdevice/libcdio.c +++ b/libavdevice/libcdio.c @@ -90,13 +90,14 @@ static av_cold int read_header(AVFormatContext *ctx) else st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; st->codecpar->sample_rate = 44100; - st->codecpar->channels = 2; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; if (s->drive->audio_last_sector != CDIO_INVALID_LSN && s->drive->audio_first_sector != CDIO_INVALID_LSN) st->duration = s->drive->audio_last_sector - s->drive->audio_first_sector; else if (s->drive->tracks) st->duration = s->drive->disc_toc[s->drive->tracks].dwStartSector; - avpriv_set_pts_info(st, 64, CDIO_CD_FRAMESIZE_RAW, 2 * st->codecpar->channels * st->codecpar->sample_rate); + avpriv_set_pts_info(st, 64, CDIO_CD_FRAMESIZE_RAW, + 2 * st->codecpar->ch_layout.nb_channels * st->codecpar->sample_rate); for (i = 0; i < s->drive->tracks; i++) { char title[16];