From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 85CFD42E34 for ; Thu, 13 Jan 2022 02:24:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 05AF568B3F7; Thu, 13 Jan 2022 03:59:02 +0200 (EET) 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-Google-Smtp-Source: ABdhPJxRiI2JcGxUaF/YjURKzZbF8aahp8R2ypHg02qnBcmh/hjdDFA2k9aeTCnDnfRPt0BhXtrHoQ== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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); } } -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".