From patchwork Thu Jan 13 01:50:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33335 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp18476iog; Wed, 12 Jan 2022 18:02:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJyoyFfvUdiJUIgtL/HfFShN/3JhOnSWKuUNI/oY9T1pD12vY9cw9g2vnEHyVazqGBGdVp3r X-Received: by 2002:a17:906:9be4:: with SMTP id de36mr1783952ejc.447.1642039359381; Wed, 12 Jan 2022 18:02:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039359; cv=none; d=google.com; s=arc-20160816; b=jgi8BLcLvFlDtwoYqSggQ9AOsSevhCYXtpWgWNYFtoeu1oDKZYGkS/2imx65JDNncl 5rOBqc/uf9aZiX/52ddNi86IcUx7lb1zhNGi61Qc0T1R48P18w+18cjPjqVf3LJgDZH0 5NYKayAdBeWlBNxk2NPxYRcGt1NPy9BcPg8KNwSfFW98GYFxjotXjVoBfk56Ah/oWsGj a59bT2Ci6jqzV5gPcOW6fA+ju+eeDXG17Ty+L566aqq+OqHK5Mlns5JyZxTBOrADU2vb vbkwstYvl33pJLLdzEP5iaoT/tcOXzIffNWgbXQxl4/8ww7AVCOZguOLBr5Z7ZotW2R6 IzXw== 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=nAa+zewRvXlMCbZ3rykQSmqmonNnJ4Kl+4LgYkjxgXQ=; b=THbFr1rlMD2NhMLkoJ/Xi59dXF+q8KQWjdnhw80eD71f8aeb9JRaAZ/ESVzjQF4zOV LBTVs0K2Pods49zMeAeiKXreRn0R2YF+6CerHeVHWn3/RtremyrdPy4J1VHuULU15eIX uXbIh1eIDNITUCWdf0brF834on3MocmJNSIMEvuW2M3IaweO1LltXQCofCfirR1Xv+CZ 3raLYEzRTOi/daHshU8pnskW5rWTnUsPIFOrKv4f+AEisNG2XajcrkSa/7HeUglKjs5M bQBJsygiTbkc3nnNiipRCmnJksV4pxT4VfCLopittQo7a/ad4VbKNWhRZC5ySFZswyKt Jy4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=mKCLcTm8; 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 p21si758576edq.27.2022.01.12.18.02.39; Wed, 12 Jan 2022 18:02:39 -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=mKCLcTm8; 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 D5EA368B0E0; Thu, 13 Jan 2022 03:53:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B40C368B0BC for ; Thu, 13 Jan 2022 03:53:01 +0200 (EET) Received: by mail-qv1-f54.google.com with SMTP id kl12so5082994qvb.5 for ; Wed, 12 Jan 2022 17:53:01 -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=C6h8t0hsvl4Dz/rLm1krrgpVsQPko7v23V+WayFbxnU=; b=mKCLcTm824/9YayZ8VBNoDJ+6sButBjds0u6jTTSY5th70b7rlPnpf7j7H6w/V3y5l JLChmAZ7fO3n2jqXGruU6VzIW0WsyWsfhxynWF6s3gijXr1s7aFB5GDEUpm08tjscMuw Gc3FWnrSqLT2dvTMjzYbFQEs27v7BF5uYbUlrk7GDbs0lXozy74nFN+UY7zjOx+e2G/g KGU0hwqQS2R2c2I4WHcPIi2NyXifRF63kPymosZlFxnGmr67MBw/yMBl4GCZVsnEiWzL b8saJ7zudcJ7KsW6IyNcppkQSMhcWYCbVULjDZg7nouDWx9uwi3o32oVWxwQePO8SN3u Ufjg== 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=C6h8t0hsvl4Dz/rLm1krrgpVsQPko7v23V+WayFbxnU=; b=Bisn5nrByjyMGJRcit+6yvxdEX3OUw2QFSGZbmIfPaTIgLk/JP9vjYfZkzD9dTEGWA 5Ce4gu283dZZvXPlaZiXQY1XYAm3HEhdk6lxE0uZZRraGo6xF0rMQcbi/hpQLzRYnE53 i0VLEQ9Oy1sTJLoLYwlu/xiivLKrxoSDROE+FYeyHGek94pX7Pp19BXos2JXzm7Kf0dZ h71ponw5zFxJtR39GXrv1AEU2rnVYEMQN4r9uWLexZvGbokvpJ2IUAk8M9mWbhkDznW1 io/VCUzw0aO5wmUhIMWdor5i6vGD8J4psgG0gy+nDkiOuSzrN8twq5NPSqU47kOP99W/ lIvw== X-Gm-Message-State: AOAM5331kxQbY8HY6p8v06kgdxJksCljw9mEDxWSUo3L/v97HscROUo4 qGmhAU4dXSdTJg2MzbPTLERZPZQes6Y= X-Received: by 2002:a05:6214:230d:: with SMTP id gc13mr2291506qvb.68.1642038780313; Wed, 12 Jan 2022 17:53:00 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:59 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:12 -0300 Message-Id: <20220113015101.4-51-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 050/281] dsicin: 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: PXmmSXnUuCIP From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/dsicin.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c index 481f365a53..13ee9f87bb 100644 --- a/libavformat/dsicin.c +++ b/libavformat/dsicin.c @@ -132,11 +132,12 @@ static int cin_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_DSICINAUDIO; st->codecpar->codec_tag = 0; /* no tag */ - st->codecpar->channels = 1; - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; st->codecpar->sample_rate = 22050; st->codecpar->bits_per_coded_sample = 8; - st->codecpar->bit_rate = st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample * st->codecpar->channels; + st->codecpar->bit_rate = st->codecpar->sample_rate * + st->codecpar->bits_per_coded_sample * + st->codecpar->ch_layout.nb_channels; return 0; }