From patchwork Thu Jan 13 01:49:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33319 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp15299iog; Wed, 12 Jan 2022 17:57:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKzCMdtUYPl9622hPu9oVundaFOh92NoBzsORC1GqrrDyNS1vRr/LrFKM8zMTu9sa3e9ak X-Received: by 2002:a17:906:3e8a:: with SMTP id a10mr1830313ejj.612.1642039071182; Wed, 12 Jan 2022 17:57:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039071; cv=none; d=google.com; s=arc-20160816; b=ZP79em18B2Z2zWkBb5ag0Gc25Y4ti8Ar1t/CEpdLip0B4f/FwmZHW6BmJ6fRXamVXI X9/sin6Vw49Bm5SEPAJQvSEPSm2Z/TlIii/tG+/5DysnK1hRJFI6rGAcmuf67f39JR5d mUkNuDmqDB9u08Jb0V26CkNtT/sKMT9kjMKLSltttofjOz6VHvYRwQgl26cp8bHdfil2 w6RDN9pTJtYfXzJeEk5dxUfPx8DYvGkzkZR8XxPGrV7xwGy0LQfoqczYJQA9BHx+xfHK xZ+tC++CBjSp0NVxo1180rXHqtImXIQOFxMCDoxONo25FvIoTD/EB4b+NysR2mA63kSQ IdUQ== 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=1xc1G3IukGFSNarbTYgSLZmAIl4kxjBd/Q9h3Izq+Ho=; b=AptolCuVupj7fglwAxkndOYKAAEZYzrcrLU2rjeIc4yfvM9KGErO8DhhhoCjVUZlmJ SNwcdVrxUXOHTw2yqVLAVWY1ef10X8P30lAEBuDT3RewpWXW3ITz0cCIS0XRkOYEciPY bZoop4HgS+MGuLCq6YHHc7BCzMvejhL7hXSoGYU/gOiNew4bRtk9IJGllixemKStA/AT PGWebwOPPUoPguePU3YGjq+B1ZuCXia9MYQo0JoAPFPxNgRNSPEJ+iKxlm3Pvk5F+gox +RTV6nqpPdRpewyhYGCBsKR6J1+Ap8RJrmR+5f0xaBFEwVe8wzsBBUm8QbaJRmjeuve8 mtkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=k4opmFHG; 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 k23si682333eds.509.2022.01.12.17.57.50; Wed, 12 Jan 2022 17:57:51 -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=k4opmFHG; 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 5622968B034; Thu, 13 Jan 2022 03:52:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1C2668B010 for ; Thu, 13 Jan 2022 03:52:36 +0200 (EET) Received: by mail-qt1-f170.google.com with SMTP id v7so5304981qtw.13 for ; Wed, 12 Jan 2022 17:52:36 -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=ZA3120Sn8Luvd8E2WwZgGsGEBXA6LQf2kEgmkR3IGP8=; b=k4opmFHGYTy5YWHk8zcCBRlrZ0pwWFaezvKoolkJirTDSjeONCnugegR7lcK1eWIyY 4A796QT7IqKt/28mWuiQa7Ak1+bq7JeIc/MD/wEayxDhRAypXcMz9KJ3W8LM/dZopj0K 52V0jFBK4z+yuWHXDmREMcB2zudpd3yi21RDIpjV3uMSX0eL4XNviUl/RqZO+mgBTIo9 796EHp5mS/CdmuwuNFFh0BVDqs6pcH8FfY+b6XrfbXfwb18ngh2+f9je3RXxS8X9ho08 yBrJ741G0Hlaqlz4LQ+8d9N6RTW5AS+j0XR8RcnwCzAKV/YUzQENnIBk72wlRSre/G0w PSwA== 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=ZA3120Sn8Luvd8E2WwZgGsGEBXA6LQf2kEgmkR3IGP8=; b=8LbStmF79RCD6G77b1J17Pczaav/LWiTPFynRZR1Q/Gb9rmR6lt9IvvRjwnPYu9TwS t3U79m+9NjW9aNPW6ybpfY2YabbA6a7mSybCLX3casHzgD7s5EFpUvSyXcCvYl8+ymeo LmtMJQQj6gDrh2+k+gL7GinTpfZNU7hIQwjMXOr2ekiUn/e0NcuQWXbj2SArotMcoi0D cAdo0YlYoMuBDNP2YU6NKTVo2eI4X6JBwL/DsbmoNE+vyHmxw2nPhvHPjnhj+xKe5QQr +o/0wrJ20hisqEEaDj0M5x5/thl3aLAAhlac31RvSVnybAuRu/PU3CrM+y63d74akUdA Y3Fg== X-Gm-Message-State: AOAM533onphCQXVzx4aSFThVZOr+jpVkIZUrY5QLqr5JM2BxkTfy/rNm set2MuRPnk1PN9JyF1Ny93pZdfiH1DA= X-Received: by 2002:ac8:5a0d:: with SMTP id n13mr2025255qta.261.1642038755027; Wed, 12 Jan 2022 17:52:35 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:34 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:51 -0300 Message-Id: <20220113015101.4-30-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 029/281] apm: 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: oNM3h99cLDoP Signed-off-by: James Almer --- libavformat/apm.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/libavformat/apm.c b/libavformat/apm.c index 1ced771745..6af0e1bdcb 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -104,6 +104,7 @@ static int apm_read_header(AVFormatContext *s) APMExtraData extradata; AVCodecParameters *par; uint8_t buf[APM_FILE_EXTRADATA_SIZE]; + int channels; if (!(st = avformat_new_stream(s, NULL))) return AVERROR(ENOMEM); @@ -116,7 +117,7 @@ static int apm_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; par = st->codecpar; - par->channels = avio_rl16(s->pb); + channels = avio_rl16(s->pb); par->sample_rate = avio_rl32(s->pb); /* Skip the bitrate, it's usually wrong anyway. */ @@ -136,17 +137,14 @@ static int apm_read_header(AVFormatContext *s) if (par->bits_per_coded_sample != 4) return AVERROR_INVALIDDATA; - if (par->channels == 2) - par->channel_layout = AV_CH_LAYOUT_STEREO; - else if (par->channels == 1) - par->channel_layout = AV_CH_LAYOUT_MONO; - else + if (channels > 2) return AVERROR_INVALIDDATA; + av_channel_layout_default(&par->ch_layout, channels); par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_id = AV_CODEC_ID_ADPCM_IMA_APM; par->format = AV_SAMPLE_FMT_S16; - par->bit_rate = par->channels * + par->bit_rate = par->ch_layout.nb_channels * par->sample_rate * par->bits_per_coded_sample; @@ -175,7 +173,7 @@ static int apm_read_header(AVFormatContext *s) st->start_time = 0; st->duration = extradata.data_size * (8 / par->bits_per_coded_sample) / - par->channels; + par->ch_layout.nb_channels; return 0; } @@ -195,7 +193,7 @@ static int apm_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->flags &= ~AV_PKT_FLAG_CORRUPT; pkt->stream_index = 0; - pkt->duration = ret * (8 / par->bits_per_coded_sample) / par->channels; + pkt->duration = ret * (8 / par->bits_per_coded_sample) / par->ch_layout.nb_channels; return 0; } @@ -227,7 +225,7 @@ static int apm_write_init(AVFormatContext *s) return AVERROR(EINVAL); } - if (par->channels > 2) { + if (par->ch_layout.nb_channels > 2) { av_log(s, AV_LOG_ERROR, "APM files only support up to 2 channels\n"); return AVERROR(EINVAL); } @@ -260,10 +258,10 @@ static int apm_write_header(AVFormatContext *s) * be used because of the extra 2 bytes. */ avio_wl16(s->pb, APM_TAG_CODEC); - avio_wl16(s->pb, par->channels); + avio_wl16(s->pb, par->ch_layout.nb_channels); avio_wl32(s->pb, par->sample_rate); /* This is the wrong calculation, but it's what the orginal files have. */ - avio_wl32(s->pb, par->sample_rate * par->channels * 2); + avio_wl32(s->pb, par->sample_rate * par->ch_layout.nb_channels * 2); avio_wl16(s->pb, par->block_align); avio_wl16(s->pb, par->bits_per_coded_sample); avio_wl32(s->pb, APM_FILE_EXTRADATA_SIZE);