From patchwork Thu Jan 13 01:57:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33403 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp29195iog; Wed, 12 Jan 2022 18:18:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJw/zEsR8zWCtl04fPQtTb1J7p+mqsevOeoXlXPL2+dUbaqLTkF6IHOA8/QWUIUVApiTqjLR X-Received: by 2002:a50:9e0f:: with SMTP id z15mr2297192ede.278.1642040328505; Wed, 12 Jan 2022 18:18:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040328; cv=none; d=google.com; s=arc-20160816; b=L/DGwfiTx0FVYGNkJaY5ykuy62/dZCT3Jhtg4ASrCVYWzHNnTL6FwhPtQ7KwZfDqyB GuXHxnpCTPd9NeSodMFNUhNTe/S6L4BT9klkxWpUi2nLmM648dvufNHhBE3G5cXZrBt6 /mIAaUNmuAKWTivaVxgZ2zBjDSXpieqmKfbMihgoLUCNjx2Hs/5mz2L9G1clZ/wdo1UK y2/aElwUdOaco5OQYqnvYJhkcoyD50+Zz6EVLu8ieXDSctovGwx+tyMiPeFt6rSSBz7T rvKrWMlKSkmPV8++oSvs8rt6ZfD6mDwtnbbCwYtXPBbVjGuDIYJ4Hn6uIbrw64BAdcc2 Md1Q== 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=DGRR5HgAJiNHezN68lA2DAvA4it6koV4URIrD9EKuRE=; b=RD35IPbl/qPGJAoJm1DX9G/XVy/wRYcj0NSb04jl0IbYpL67ttjJVXN/d0QyHao9VD iI4dTFcYmGRNnmoJHst3OeEzAzL5ILDuwfyr9MDl8U8yeMYTU5vfLAocr0fAt/yGuZhe abjpU8cE3NUBOQzCbAYwryFJ26zk0DAQLP0wXkK7Bkka4A+fm6eQ0k36hbaCWxhK0bFR crDMW+04dpChpACcqr5N+NbsReBpVNohkZ7iVjTONkbvnVV+f0OwW1NFxt9tZyISliye nE6pAezBOjih3DnDcCAxl4mG/clM+rABnZwtfR/Vo4Ok3V+gZPC03DJqxqFGd6scKnSZ Epgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KI9TaR6l; 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 c73si860571edf.241.2022.01.12.18.18.48; Wed, 12 Jan 2022 18:18:48 -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=KI9TaR6l; 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 822EC68B34B; Thu, 13 Jan 2022 03:58:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 379CE68B337 for ; Thu, 13 Jan 2022 03:58:32 +0200 (EET) Received: by mail-qk1-f182.google.com with SMTP id bl18so5573427qkb.5 for ; Wed, 12 Jan 2022 17:58:32 -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=0yArpAsfrWpAF7kXvO7K8JmT2dvJnoZDa8KF4iY0w1s=; b=KI9TaR6lCgR7/ryXEXWsZG+vNJekywuIe3KZekLV263zg9Hj4cQTf7V7qUTx/sj+te jrdG3Qlel1XAMQ62jdRrhsMdhWweeQhUnqEEI1JV3Kj3gtp1FkDA2CLhockP+hH4scCP UXNlCQdX4IQSQm7Ivktw9qcLIsXfTSeXBlWZYQCrO1BBxlmPJji7S51IiRtz8xnjmlvA bOcD83y3cmChfafPaHvP3U5l3gj+vstsmNrYKF+nOQHbwjiG4WrwoSPfjh4H3Ho1hdms 8812tY2spLHDPimwA2JxF4bsoJlkhubbPBOqOc3EVOU86wDOWU506vWiFmB0x6bmDi// /XHQ== 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=0yArpAsfrWpAF7kXvO7K8JmT2dvJnoZDa8KF4iY0w1s=; b=tuciw0QvcS2m99lOFzXSpYw7bq0rZoMpM03sO2rzx61B+m7aTo+0GE5y5uaZV4eTZE haGHHjc8tTuCgyVDy5ISUBq2xTTerHxVvUo1DPALX6+gH4QSXPIosw3MNjghiwWErmvg d7kAxW1i/ryGoclZ5MiLANtHwVjpxrZ2WXofR32AAjrwUHcgcFW5uzAYjHG9kgEdknEK fznKoSrv51RJp4vRrdWERRVUWAOT7T6TCJtGYUZ4b7w3sBsnR2nXsyJxD1f8R95ywhKB O4/qrO9VoSZkK1y1l5X5Xh+wjXPYaeIF3AOzO3LBYzKwpTJg7BKAoM46V1MegZh9lGfj 5uFw== X-Gm-Message-State: AOAM530V6jRDVnVJBV2YKXBnNMdZFitqstqGm/9takvJL9MkAQFKkR3D zZW4JAZ1XVohbzktGQegootcs9/pfHw= X-Received: by 2002:a05:620a:46ab:: with SMTP id bq43mr1852483qkb.541.1642039110831; Wed, 12 Jan 2022 17:58:30 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.58.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:58:30 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:57:40 -0300 Message-Id: <20220113015806.519-5-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 123/281] psxstr: 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: DlKVNIxtF5FY From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/psxstr.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index e649ba3ab4..bb56b05688 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -252,18 +252,12 @@ static int str_read_packet(AVFormatContext *s, st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_XA; st->codecpar->codec_tag = 0; /* no fourcc */ - if (fmt & 1) { - st->codecpar->channels = 2; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; - } else { - st->codecpar->channels = 1; - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; - } + av_channel_layout_default(&st->codecpar->ch_layout, (fmt & 1) + 1); st->codecpar->sample_rate = (fmt&4)?18900:37800; // st->codecpar->bit_rate = 0; //FIXME; st->codecpar->block_align = 128; - avpriv_set_pts_info(st, 64, 18 * 224 / st->codecpar->channels, + avpriv_set_pts_info(st, 64, 18 * 224 / st->codecpar->ch_layout.nb_channels, st->codecpar->sample_rate); st->start_time = 0; }