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 334FC42E4F for ; Thu, 13 Jan 2022 02:27:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F24D68B4AB; Thu, 13 Jan 2022 04:01:19 +0200 (EET) Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7FEA668B490 for ; Thu, 13 Jan 2022 04:01:16 +0200 (EET) Received: by mail-qt1-f173.google.com with SMTP id bp39so5318086qtb.6 for ; Wed, 12 Jan 2022 18:01:16 -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=U+0QI74KRNNP3k8u4xl+nINCQt1DqQNcxTLrTQlnJDY=; b=lYE0Aatt0SgXBJUBTlf3UmPL710paAmSsWLkv2Ul7g/DnGm7bJ8sYKUxq8xilq4w5w sz/aMDAeZB/XEliVKK/XUsCF+xZoAdjF63CSSFfZhAlMfM8ix52rla2cjUpd3kTQWSWX U3ME48yEPYOTnQ15mISlIj1jm8BuyduxDdWP5cVDeMhozjxkfRAjR0mEk8l7wriQus17 Inh3LcrGjn16h3+T1Ek+q1kRPZa31sw1NwZseuzMQgW2x9TSwwyVlD0zLoq/i+pV23Y8 3Pdps3sxeo68sClB3Q6dCD9kIBC+LxhNNf28iei8TWY7UqzxuGzRkv+tn0TiMScJM/9E w8LA== 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=U+0QI74KRNNP3k8u4xl+nINCQt1DqQNcxTLrTQlnJDY=; b=cryRpatcHn5b6AED3kcUAV0rkF89OtSPyW//izfWsp2Kd3B/DpwuxEuZyx3VbB5FuQ kNlaTBqzQZAy4UNQnAue08Sgh9uTI6IOg944P6+R5RK1WMy9BBff7Tqcqk/y1d9M2RbA QKaz6M6u8iJFO53A2zj6HICwdmLeZUUsGMt5myon83teRWsL5AMZXbkDbM6IIYNfZ1tZ AeiA6TN6yEW7ymK/1Dx+khHnD+NuumHgkR8ANgp+OK1zS5KZajrng5BhsQgIOzAL0sRu ldhjLosZlcKMIOYslZoxeV2IA8sP9unpgdCB/OTroMoYuTyGr1sINI2GlA4R80uOIWYh C71Q== X-Gm-Message-State: AOAM531bKZNBOZnFwXAHkn+tLvz7hpbFeR/oXOeVIEOsBL9xQ1WqgQ+z JvbynmvIkEruTs6kcF8EQsUHcpjZgk4= X-Google-Smtp-Source: ABdhPJwJZaZ6TSKBmLmeZuipHuBFC0eAjJqkr4zMTJAd8NDL/2YlCzAYeqz4GM4h1bDFVABRoFeCaA== X-Received: by 2002:a05:622a:18c:: with SMTP id s12mr2081646qtw.556.1642039274726; Wed, 12 Jan 2022 18:01:14 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:14 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:05 -0300 Message-Id: <20220113020026.590-10-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 158/281] tmv: 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/tmv.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libavformat/tmv.c b/libavformat/tmv.c index 507f6cd032..ea39954190 100644 --- a/libavformat/tmv.c +++ b/libavformat/tmv.c @@ -113,19 +113,13 @@ static int tmv_read_header(AVFormatContext *s) ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; ast->codecpar->codec_id = AV_CODEC_ID_PCM_U8; - if (features & TMV_STEREO) { - ast->codecpar->channels = 2; - ast->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; - } else { - ast->codecpar->channels = 1; - ast->codecpar->channel_layout = AV_CH_LAYOUT_MONO; - } + av_channel_layout_default(&ast->codecpar->ch_layout, !!(features & TMV_STEREO) + 1); ast->codecpar->bits_per_coded_sample = 8; ast->codecpar->bit_rate = ast->codecpar->sample_rate * ast->codecpar->bits_per_coded_sample; avpriv_set_pts_info(ast, 32, 1, ast->codecpar->sample_rate); - fps.num = ast->codecpar->sample_rate * ast->codecpar->channels; + fps.num = ast->codecpar->sample_rate * ast->codecpar->ch_layout.nb_channels; fps.den = tmv->audio_chunk_size; av_reduce(&fps.num, &fps.den, fps.num, fps.den, 0xFFFFFFFFLL); -- 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".