From patchwork Thu Jan 13 01:50:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33603 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:122d:0:0:0:0 with SMTP id p13csp996929qvv; Wed, 12 Jan 2022 18:09:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjjUZsorpldWa6hBdhRfxmr1cxfMOLsl8T6R/O66IDvmsvVwOwzDpBzcgd0osx08krI6ba X-Received: by 2002:a17:906:6c1:: with SMTP id v1mr1840756ejb.638.1642039787006; Wed, 12 Jan 2022 18:09:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039787; cv=none; d=google.com; s=arc-20160816; b=HERO8eH6aOyo/uZgrnhfbhYDxEjXF+1bQagRSYVuY58ay1RsboIxkZbgcPY/fkoY5o D6bgi4Y4ZDYmDdv9RC6a2ox/oM4pBlvKBgVDhJl/Thz9+PaJPqRtDekoHtRv05//vbqX CzKKhn2ICskzo0pkAG0AIA+dGn51ujqMW3eJlKE0/RQEJ23SRyNhS0qZqEaKZRKbPb6Q LYrru5ihIBQE3a6tN0MMX4E3DUzYPqqJZh6PUt/fih8QDhrDU+R+cRIbGnxOPUU8z/R/ 33s9UrftAgHlQwU8g0j/Nsco1MFFgfImvuok0CAb3mcQUm7t3J0ZsVdvaz19dTcqdHer OwQQ== 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=ZmkLrgKf/aOQ80/BxqhEIKGYNrdkdi5cfpnz3XAR+Yo=; b=Yb80dCotc1lZOD4td5UsLUc8CNL4cGguUnK91levL4aqGzT+6OKiDeakgjffHCDbcS C04Vpfz8FBu0+lWrkkeG/HVv74Vj24D1ZsNgXJOwXcqIqt0TqIYTHw1q+W0/pNTb/VId N5ufIJb55bhCXX0hPJ23tCmozkGQrUsJXVjb6NiqzXCCyC9hGS8tcU0CDNzRrCT9Y4fN XzxKmGYiEiRaTkELATkaJTTKePj8lcKDib7T0uqKz0vm1tWeSvjb8NJT2HhyAmI3ZYTH RJqsnLmSLDz+kZLm/JMEYcD7ThZk6ayfwJx20bu+Z8hHiaygz/n4L9oY640PICA0DQvP LHhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=R58oqDaH; 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 nd41si787075ejc.889.2022.01.12.18.09.44; Wed, 12 Jan 2022 18:09:46 -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=R58oqDaH; 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 826E668B201; Thu, 13 Jan 2022 03:53:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AEB5A68B1D4 for ; Thu, 13 Jan 2022 03:53:40 +0200 (EET) Received: by mail-qt1-f171.google.com with SMTP id q24so1539480qtp.5 for ; Wed, 12 Jan 2022 17:53:40 -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=7CMiiGRP0S33iigCE5apl0SWQQJU/s5/a5P0MpuvLr0=; b=R58oqDaH495zX2XVMq3sNLA4MYKMmn3pvRnyd/4KRSGlFgwzfHC5l/BV3TCRfml0n/ Ily2KBS2CeSZky2pXGxlXlmnvJI2vPvZKSdtPIGnFlAghOI2vtNJjo4jjRmjTHqCZn7P 9ytOkr7ethrwKk974h/qIk3wOQpDwSWpi1JOxIWpGKL6UBm4Q7TScNeoxrX7xMHapQ/A /rUMC4e1LdXgBM1IEtONNeVJ+BA6uZdO2RNTOLPOBFG26o1mlpoElVX3PFm2br6u2lz2 2zxaOZRdSwXRE162UASLwz2pdTuHXsvg4PWTlt8gvODCXY8B4s/G03hpmrIg3OBKlAFv O8Rw== 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=7CMiiGRP0S33iigCE5apl0SWQQJU/s5/a5P0MpuvLr0=; b=p2kXW5ANw+uFljH6qjbzFQ4djWmQwMQBu3eNDTGsKgOuohVCYk1EyXq4mxFI6gS3eQ 6eqPPvg/VV8HwGQu4yvxX4lTNL4l/V7GFxlYMvfE0q7jdoRChb0ra00k9WhMaQGNsYqx C+KOYDUkqaA9nowH8pKQ2ed2DJEgNhQoLnHXn41YEl10sotdvgts3LeAX0bTQVKuiEew ZzjuZ8BHdUtWDtTe1fv+lqoSZTfuQq1DMPuriJr5q0PW2d8v11N6Ry4R6hQS/f6fve+G G0do+04Bf03K9K0sxLO1XHb7c/stFDsqsJu72N9yloGWr+XqLGnWL0TxPwIVSqvPvIg6 jNSQ== X-Gm-Message-State: AOAM5325LO5n8235r2F73fIMHSfoUpHHyCUAPheBReWVgSqU6NfCFtHV saAYSihLA4q+DQ4UYsee2K335a+Pp5g= X-Received: by 2002:ac8:5d94:: with SMTP id d20mr2068374qtx.214.1642038819200; Wed, 12 Jan 2022 17:53:39 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:38 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:44 -0300 Message-Id: <20220113015101.4-83-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 082/281] ipmovie: 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: ehQSVPnBKgg3 Content-Length: 1836 From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/ipmovie.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index 9c996d4a98..793f1f6fee 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -254,16 +254,14 @@ static int init_audio(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = ipmovie->audio_type; st->codecpar->codec_tag = 0; /* no tag */ - st->codecpar->channels = ipmovie->audio_channels; - st->codecpar->channel_layout = st->codecpar->channels == 1 ? AV_CH_LAYOUT_MONO : - AV_CH_LAYOUT_STEREO; + av_channel_layout_default(&st->codecpar->ch_layout, ipmovie->audio_channels); st->codecpar->sample_rate = ipmovie->audio_sample_rate; st->codecpar->bits_per_coded_sample = ipmovie->audio_bits; - st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * + st->codecpar->bit_rate = ipmovie->audio_channels * st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample; if (st->codecpar->codec_id == AV_CODEC_ID_INTERPLAY_DPCM) st->codecpar->bit_rate /= 2; - st->codecpar->block_align = st->codecpar->channels * st->codecpar->bits_per_coded_sample; + st->codecpar->block_align = ipmovie->audio_channels * st->codecpar->bits_per_coded_sample; return 0; }