From patchwork Thu Jan 13 02:00:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33452 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp36437iog; Wed, 12 Jan 2022 18:31:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJxUQ2NT5WaJzM1X9efuAOx85AZfpbi7QJhh4t/9s5Nv+dJ3pQ5EpTRluIKiO4nKZcPQHJEq X-Received: by 2002:aa7:c1d7:: with SMTP id d23mr2223172edp.25.1642041105732; Wed, 12 Jan 2022 18:31:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642041105; cv=none; d=google.com; s=arc-20160816; b=QQqUye7ukfTyz6cSwJxqE/T9bNODCGO5d6dNAQQPMg862h1SU224yVQwcvFJTrCnhk KgNk0uOg6nBh7O5FPnbH+gv0O6HlvETL30R34iNyqTDUWjJVP8x7JogoRjop8LPx66/9 IEQqpf83yaQoV7l3btFF3ai0qbTQd1i8MUai0yGPNOi63XMh9Ro68RheLaWWnlXnutic J9eGcIPHDfU/KB4BsWJtwOm8Hk1SOARgxhuyuyAr1lE9gNPro5G0h3SUnBrLUIYX06Ww 2SpeULVAgITiukUvbaTpH/q6xSNd0mFj7T9hgNn/7gR+0ZImCKcibp0YH0mAIZlKT29E pscg== 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=UMq2r8N+24y6c5wB2jq+ebg8LQkH2UEyaMm2ci9+Td8=; b=hifahw937RxXwzQRlVsLe65e34klRllpTwOoLMJQvR0RvOdS74cS+fSDUjMTNtjYBH Cc9vuHfnWpjR0vcbNhMxcjdiTkN8a2GF1Wa7wahnK+a945xmGQws6I/lck4Zs0OCJbtg LzmkOcgRpZ3TcgACK48XleNIKWxVQaY+YwU//00tFFksNV4az4mvkeVplO+HQuHskOrS wtTpwPXJKfkaWp9RhkmjBMyZp9kKU+SMR7sJGsLcYPpYeQrvE1f/ubQyo2JvU3tAriOa ygu2XoTH++8dROf+pAeXTmuvdyCnoU9GfxHByMeM+zcW2BnE4TlzILtksQvwKw99ysTm 01Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=d5IJq3c5; 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 i16si790412ejw.829.2022.01.12.18.31.45; Wed, 12 Jan 2022 18:31:45 -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=d5IJq3c5; 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 CECF968B57B; Thu, 13 Jan 2022 04:01:47 +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 E6FE368B573 for ; Thu, 13 Jan 2022 04:01:41 +0200 (EET) Received: by mail-qv1-f46.google.com with SMTP id q4so5101337qvh.9 for ; Wed, 12 Jan 2022 18:01:41 -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=aVaUTiXoEzBU0jSlidrpr61Y2a2XL5MEpVArjXT13xo=; b=d5IJq3c58FvOmClDN4NzyEII6M8NRA2SvR5lIigXY6pbdgQe8dtWzTX09CkuC3aHkn /XsM40DIy90sAvwEiR27D5IiPuU8BC1zNzJfCeqb9pqx1i+3kRhXwEbAqX7vb5mvQvMb xIuB/JJHaMx3mPnUjaNSzbbNc8xe06q4Iwc379Z1g843SGjmnaL7AF+qsReYz6W1MTj+ gMicOyUJVxA5v4X6qZUWhzwYLhi6F96QyTLg6gtAQnJxCmGZVbVptXpOAPkQ3/OtNDPh nMWotdpekn7oqAbHkNTZd+1ZwP53P1U6NCPKc1dIo2T7PMecVINQByYc+9XW15IItCzp M1rA== 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=aVaUTiXoEzBU0jSlidrpr61Y2a2XL5MEpVArjXT13xo=; b=4pR7PtHH7jPxOh0bMCcwipTRnv5BBazGOSrO+XhgKFMO8hFKli5AqCXnwaOLxdvwdY b7namcppo7DFrmw1GrZ0hjgj0ZfCC1x3OkA8ELlagxDRoHfvO5Y+3hmVo9G5lxpHQQTJ 5bEf5N8wFAu7eDW4d+p5OdWQ6hLU7XQyeNQXYBR32clHxiHG1IhYec2tm9bpYsrXXn7W FMSodIioBa+k6x2teAJ+f1Y0oc4IoDkTkC9aJiYrg7TOlFruaZ1BLPlnBe1ZNZSlidS6 HXxd1VvgTG+kipvKUt7d5GXg+yvWXaRmdiapj9PI/y1m4pNxeDMeYBCoU7pnv+RLStgB o4VA== X-Gm-Message-State: AOAM5315L4TaBhcSZkCgcn15D8/7E2kGfN3j9CLjo5Z1rIY4mrns20aJ kSqeoBk5Vp2MQMSl/B5fwCflajK/e6A= X-Received: by 2002:ad4:4eac:: with SMTP id ed12mr2095968qvb.71.1642039300624; Wed, 12 Jan 2022 18:01:40 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:40 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:24 -0300 Message-Id: <20220113020026.590-29-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 177/281] wve: 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: BdYv4OCLc9TX From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/wvedec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/wvedec.c b/libavformat/wvedec.c index f133da3c87..9b2f7036e0 100644 --- a/libavformat/wvedec.c +++ b/libavformat/wvedec.c @@ -43,9 +43,11 @@ static int wve_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_PCM_ALAW; st->codecpar->sample_rate = 8000; - st->codecpar->channels = 1; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 1; st->codecpar->bits_per_coded_sample = av_get_bits_per_sample(st->codecpar->codec_id); - st->codecpar->block_align = st->codecpar->bits_per_coded_sample * st->codecpar->channels / 8; + st->codecpar->block_align = st->codecpar->bits_per_coded_sample * + st->codecpar->ch_layout.nb_channels / 8; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); avio_skip(s->pb, 10);