From patchwork Thu Jan 13 01:50:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33607 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a05:6214:122d:0:0:0:0 with SMTP id p13csp997063qvv; Wed, 12 Jan 2022 18:10:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJzh3X2NPvuKZxkrz9nEWGoTfDD+nwmyIiRN+zsomIczyLtmg7TlAGQtDMeTmLHf0hQKqk73 X-Received: by 2002:a17:907:72d6:: with SMTP id du22mr1912257ejc.519.1642039802979; Wed, 12 Jan 2022 18:10:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039802; cv=none; d=google.com; s=arc-20160816; b=jvmesa6td/1dt37mhI1iEbaNyZB+Gi6Td5LpHLgcACwhCVn5xU0YvP6gjkDjFugkW/ I2a07ngl65t/fcAWoPbzDMRXvse+saSAA7+0vfsZm0I8fFriAgFJhQ7UdwpNHFrIZfdA 6QowUDNd105A+2X22leFDG8w6XuqH1VzHKkJUVqOavUgj+f9y21T9f+R26P+iu589ppZ fuPNrnTeExXl1btoF6GBv2UYSCM4VEk/uD5/jsVZDrNTTAUwasMBThQWHCDnvrFkkU5T O+p1W12iPNK2v550BS+rVs5vwz/yn7rkIcmSpzhKV/wzmoyBayZr3IBTxldvmw/z2FZL QAXA== 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=ICyWS5IRBs0gqh8W9yoy/rQy7pyn5rDX19dORtBxflc=; b=rbk5KduLvsJGj4UOd/jJAZL81iKhhN8COqzFiBP7Aroc2co1hlSOqObC9BzVT7+mfU m7K0PJXdd9DmMsNqSvuwOTkziFFLvSByIJF89ZJuJQ5CsR2epHo0b8BEMBzVDaC+5ORU Yv+u3/+LYLI5npF4RDzh/xErYuU7Rds8t5MUqY51ov3Vttp/xHj/bx6QlemxFaYCG9N0 MO2Fg3+dBFaYsUv3TwnPTI3fTUx0/lvLj52tBmOGl/Ss5DVjixgoUxbp8TPMVZ06b8sn A8wVSKoN/Vlme7rScUUS1zOfZMkyfHywVrBq4lhZymCPgqP1b84DhS0ySpOvnRHxoola nCGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=oEfQ9v82; 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 h22si1030129ede.494.2022.01.12.18.10.02; Wed, 12 Jan 2022 18:10:02 -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=oEfQ9v82; 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 CFC1E68B204; Thu, 13 Jan 2022 03:53:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18BE768B1DE for ; Thu, 13 Jan 2022 03:53:42 +0200 (EET) Received: by mail-qt1-f177.google.com with SMTP id v7so5307424qtw.13 for ; Wed, 12 Jan 2022 17:53: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=dg80Yfje4UVFaMcU2vLdx2TF2uc9AchGxY6g7r3hECU=; b=oEfQ9v82och1d6y01YTAbdmroAM6gmQkXkSDuGXfT66vH9AZi5eWpS28JUiCRhV0lj Sl8IU9knVt6H3Cv928igzabHP8sNFjxQk6n+MS+8Smi573FXvbihjbrN9E4ENIm348OL beJcoQW70oIsvBuW/fAHP9uRJIhLDFYttUSDTFu12pgeXqlvbhjLqro2R3gDn3LAa7ja Se3Fi0Adk7v6/dmnbKCYQ3kxVCIcJ0M59xKXXFXSoZAlZLuvGL0VaHYE53lJSg1Q4ulw xZ/B+NZ0HcSA0w7s9c2r3QtQ+Ncy65/Fip7X70qt8maszkDJxnza8AQqGx7qzP0NL6Y4 jvGA== 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=dg80Yfje4UVFaMcU2vLdx2TF2uc9AchGxY6g7r3hECU=; b=BaQuaIGpSZmouHpd0QbBDEoPtIgO6ulTvelTjenNRjG8FiucBMhmq7vqDITXm7+vW2 QyBJGiXB5l1F3Zj6NkuwWpXABKDc1QWeW4soYCUe9lhmXROBTk9NgDJNCtidfENZ3do9 hFQpxauKm/u1xuNy69U4v3pG8wB6/98pet8KQqVRjghQNNZFVRtbhead4ZYkHMqE2JIB wmaxiclTT5PcTRAiR8HZnjFiIw0a/TwktTP69+K7/FksS+qZrNMg7e/u/UDvS6Ee8kT9 A88qHsyU/i7Qo5REsSYBSm0tH7DbBCGHuKmpxy3wdT3FjrI6ZLUu71Iqct2Cb3qO4Afc +jKw== X-Gm-Message-State: AOAM5301F79MEjGAz8AU+7DZaFE2widHS8QeT1GkZ4AwcpfWkgpC2Amg vi5XlXZVlQOTPffGnHmywL/GwNmGJEM= X-Received: by 2002:ac8:4e4f:: with SMTP id e15mr1982690qtw.168.1642038820382; Wed, 12 Jan 2022 17:53:40 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:40 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:45 -0300 Message-Id: <20220113015101.4-84-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 083/281] iss: 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: i7XQL/fCkHup Content-Length: 2341 From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/iss.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/libavformat/iss.c b/libavformat/iss.c index c58c5923ba..f54ff8b0de 100644 --- a/libavformat/iss.c +++ b/libavformat/iss.c @@ -109,19 +109,20 @@ static av_cold int iss_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_ISS; + if (stereo) { - st->codecpar->channels = 2; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; } else { - 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 = 44100; if(rate_divisor > 0) st->codecpar->sample_rate /= rate_divisor; st->codecpar->bits_per_coded_sample = 4; - st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate - * st->codecpar->bits_per_coded_sample; + st->codecpar->bit_rate = st->codecpar->ch_layout.nb_channels * + st->codecpar->sample_rate * + st->codecpar->bits_per_coded_sample; st->codecpar->block_align = iss->packet_size; avpriv_set_pts_info(st, 32, 1, st->codecpar->sample_rate); @@ -138,8 +139,8 @@ static int iss_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->stream_index = 0; pkt->pts = avio_tell(s->pb) - iss->sample_start_pos; - if(s->streams[0]->codecpar->channels > 0) - pkt->pts /= s->streams[0]->codecpar->channels*2; + if (s->streams[0]->codecpar->ch_layout.nb_channels > 0) + pkt->pts /= s->streams[0]->codecpar->ch_layout.nb_channels * 2; return 0; }