From patchwork Thu Jan 13 01:58: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: 33422 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp32384iog; Wed, 12 Jan 2022 18:24:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJyuMZisS/p58jq7jTgkv1/iDn5U6LkBGP5ljXpB8uoRV/C+lKbuUEqWi61Bg2ASE3J6RSEg X-Received: by 2002:aa7:c30f:: with SMTP id l15mr2229153edq.310.1642040646581; Wed, 12 Jan 2022 18:24:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040646; cv=none; d=google.com; s=arc-20160816; b=0UwCS9rVyzDsjw+b22D0yFUsQLhndlUBk8Zn6Ql5nv2Bp3c30FqqW6PNq3rWvzzSX/ xkb4mH6QVPevLzDVmsWnkyH1PCeX8Kt/KHtBrG4nO3Ph709f5OAU4ooGJ8vJUakAwoqS NTqzcXX0rGiGVuz3IfRIjo/IvaZGKi2PExXpuLKHrx4L6hn5Ik4pnsgua3nAB1urVaaj /WgBgfexNCOzASivIs1O9zNwbh8F1yN2cNNjWt1mNnUMB1a+IfjS1TpXwndCW/LUDFZi jfAWDEJ05pdFPlvnc26GvUZLkan3dZyi8U+/OwrdE9mQbh3F6pfUFHqqGlOpO8K3tD6e CM5g== 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=+q1jEkS/hHsipUDw/t+A22ly367QL0dCJ4C+RmDJahs=; b=Dd0RytZlTs/54bew41rWipY1zUGnS9reXrYgVNHk4h4+3omp3Ia0w0M+CH+PjKhg4x hnedGeLa7qYl5+PJYsKlICQ7DOGW0r5wxn+M/V5hbUvkeQFKRMwh9VB75eSXncUTFzjq N0Dcndav8BUQuVzflCfHjOw8wQwDgkfBiGMVTznkqaAhxj7cX1gQqoLMT528lWbst4SC sXaBf8GVQhjtX89RGNZTM/p9g2Nh3jKim3ZfdscknVK1AJ/cGRMxHb8H6iZD0Jud/N65 M1lnudTCjlzFnifIFg2vJC9YJzmb28Ujov2fO4+ioUjrMPdYeFMIZupvtHvCwSxjikSp J+Nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Fhb0X72U; 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 hs5si885502ejc.181.2022.01.12.18.24.06; Wed, 12 Jan 2022 18:24:06 -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=Fhb0X72U; 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 3789468B3E3; Thu, 13 Jan 2022 03:59:02 +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 3E72568B04C for ; Thu, 13 Jan 2022 03:59:00 +0200 (EET) Received: by mail-qv1-f46.google.com with SMTP id p12so5094378qvj.6 for ; Wed, 12 Jan 2022 17:59:00 -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=i2itdWU0XHMfRqASJ7fS1DBwaFCdS74PE94q7WfimLs=; b=Fhb0X72UUUbMEWNXvZv7ET8meaqhkCet5zcVu13ZOMfOEF3gkg1uYMR/i16ZyDlqIK T8w9wQ4U+Jl8LhygxEhJ4WthffVsUgkyYWhEDFs5tX323qVsgUbQ3DAab3KX4xnaV0Yq i8bQQIX975RkQF+TwWQNG+DbYOJzv0le3muEDuyXaSv9kDqRSti0NJkp/oKXhIz8tR0V XSjU/qu39vUHUUo2FUH/zAx+IOOCKU9sou3lgpCzWSqmjvD6cDKJKalFkl2Y/7Bkba2o Q+Topp5opdheTc7aoXIADzPcv62D1JexW6yb4BhTvFiAqegUfS6AK00slcjRDJP5Ra43 AHUQ== 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=i2itdWU0XHMfRqASJ7fS1DBwaFCdS74PE94q7WfimLs=; b=cb8pEqPITShKgi2iRYXFMFi7OyrDkR18zLH3lwwH50w4FUtfAGcKekcQ4OyD14sAE5 aBW45zfbRjYhLkX7L1u4EOHdhZRu3vKKWsQcJnJz5WwfX/1bxbONXXjvhRrqMyAQbUzw p+8ULaJzUnav2fx2joLog0Bhn1G0nOPC9lfEqPO8DWIOyNtNJYREiHErr1WQ1SWiryfP Dg4ZnGlfH0CkJUpHf4VWdUVDH9pun4Ucgz+CVaAvudayLw4hAd2q6X+Ab7g1BEbQKVqf Stjs+OqIEqmlrQIZdhUuLqkdwvKwAwETogrhVbeyk5Zz+qRgjoXJv/bCfCyVLbcrwj9E FBrA== X-Gm-Message-State: AOAM530psfFF3pez/DsVxkAlkJ8ERIbSeNfrlyPPNFxZpDHMQRbumbJU TvEPZ1fEbVuyjTSZqtt7KclhRi6zNcA= X-Received: by 2002:ad4:5f0d:: with SMTP id fo13mr2132054qvb.90.1642039138880; Wed, 12 Jan 2022 17:58:58 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.58.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:58:58 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:58:03 -0300 Message-Id: <20220113015806.519-28-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 146/281] smacker: 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: Bxn4JDQPpM0i From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/smacker.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/smacker.c b/libavformat/smacker.c index 98436bd708..80d36f2f40 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -186,13 +186,8 @@ static int smacker_read_header(AVFormatContext *s) } else { par->codec_id = AV_CODEC_ID_PCM_U8; } - if (aflag & SMK_AUD_STEREO) { - par->channels = 2; - par->channel_layout = AV_CH_LAYOUT_STEREO; - } else { - par->channels = 1; - par->channel_layout = AV_CH_LAYOUT_MONO; - } + av_channel_layout_default(&par->ch_layout, + !!(aflag & SMK_AUD_STEREO) + 1); par->sample_rate = rate; par->bits_per_coded_sample = (aflag & SMK_AUD_16BITS) ? 16 : 8; if (par->bits_per_coded_sample == 16 && @@ -200,7 +195,7 @@ static int smacker_read_header(AVFormatContext *s) par->codec_id = AV_CODEC_ID_PCM_S16LE; else smk->duration_size[i] = 4; - avpriv_set_pts_info(ast, 64, 1, par->sample_rate * par->channels + avpriv_set_pts_info(ast, 64, 1, par->sample_rate * par->ch_layout.nb_channels * par->bits_per_coded_sample / 8); } }