From patchwork Thu Jan 13 01:55:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33385 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp26787iog; Wed, 12 Jan 2022 18:14:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJznkeY6KJydORJJlncxQrOSAovNQgb6JSyJxDdSw/xcSKE0NpZr3gedslkPSDSeDbOPy5s7 X-Received: by 2002:a17:907:2d9e:: with SMTP id gt30mr1977374ejc.495.1642040099445; Wed, 12 Jan 2022 18:14:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040099; cv=none; d=google.com; s=arc-20160816; b=IMu/kYHiQB2hBDKHm/BHPJ0g1/afqk65tq+ACRys2VOFvLfZYiH1DebStfE51jzeOR fTmLmcnQKu3CfoLxDxv3oNCZoA3BwxsSV9uBDW4wlO2IeIZR70Fi1DERZn+AjAMdePWX CasY4uEERGhbUGINcPPUZGc6KM9nHzqctVA4E23jTCZgoa2y2gyUU9oPjNlzRLg2Sove /FsD0bCqDMVigU+1Cp5y2mHep3lSSFL+omlcl4P4eUclNV80Kbh71A3wySebo3EUcAME o59PtZxXrFpV3Ys8pVINWRPRY5ha2deYpXGhGvMY2G+KZZUJOz3MbfXR+TQyhKOisx8c wwjw== 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=a7nFqlDtAW3iE1RT4oxSLftUSvsP0pvkRwPIZnPS4Hk=; b=jV6faqMNYzS9U5D8W6UM6/g0sWbAZ66Vgtd0jUJZXE2dq/TdCJQAgA8jiqWSVH1BQl DX9ILXEdxqowfxnafQEZf/OL2CPGRgQ2oL9OJDsHqlq24gFC5pOMWJaCUd8hOA7AYiBO piExLq1AWjYtS7HRiWa8gsLzFot+mXweztByEffibijVDrmsZF86O3V7TqtCqB+OnNek WqZqf5R72Oon3140yXTkT5PsRF9Krp2/BJiz5QUelaKeJsH8YS02sHtPiEdTplgI+0Ez CEJY+nrnyBOVjSqwZqIL3FKakdIr2wzrZFtYdU3ufGlygxf74C0ZdEL+ofMyVL7GGFE0 qCwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="q5tu/+hC"; 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 n18si740890ejk.571.2022.01.12.18.14.59; Wed, 12 Jan 2022 18:14:59 -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="q5tu/+hC"; 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 37BF768B28B; Thu, 13 Jan 2022 03:56:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B05A68B26C for ; Thu, 13 Jan 2022 03:56:47 +0200 (EET) Received: by mail-qt1-f169.google.com with SMTP id c10so5375291qte.2 for ; Wed, 12 Jan 2022 17:56:47 -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=JfppnFsrsk/Xi/6O7P3kR97yHzS5ynpdkg1sNNufg+A=; b=q5tu/+hC0SW7ugQEdSpvt3F9/V1zATKXI+YiBN9EqFWZMKnYr72sp/qSAaRu0MzA0e aBS+9M1DF1WW0fgSSnlQOLP5DQl5MI2bcMcROUf6Rdct/SQypDNuw+x3p2nd73h1ASsG aI2TbAxLwQAUkWnUnO9NHXdqcBJdd5ieRxIFz9G/jUf3FVzFT4pYj097cHRlUYxqe5uH isnkka5+sQzMxsclxnxsac5sSBmORTIIG/iW+FlHuZvOlId8moOzodP+B25TmDCoKNMN G2YZwX2Iq2btI9FqP7s3+JLJye8A1XYOlmV282wvJmL1swbvWh9wpjDGCZVu1quFL9oK ew8g== 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=JfppnFsrsk/Xi/6O7P3kR97yHzS5ynpdkg1sNNufg+A=; b=KLWu7tC3gNlwiGh/itrNCLbt5Uc7OEV99e3xW9XWmw3n9FvQu3Ntq+uPke4QuxMSOq yRRnl6pd5OJFwwk+zkMGhy9pD2APWDNL3+0mdGqHWVoCWBOF9Q5o7sdO5vRvTFlKb5E/ GhV/8uZ38vK5u9ERNxLrk7dxqsHS7BCFK9xjer4K51S7CLVcJbZjLyiTI23v7XXu86XJ 5aotP6a3Dl0uF6n+bWcYZceIq8T5+/jEb6HnkmcHjtvxJGmcBNS1Nx3djBgSQyt/+eLo taNdIDmHnmepQtt05Q/NpPU4cUWHFsXlZ8WznZnT+OsfZscqdG/Dba9zGHWmtzyZuVih Letg== X-Gm-Message-State: AOAM5304l/OKucB2j6SVupIvkJrI4H15TrcHH9nyJ+YGOyt2V+r3x4kR ekuPjRhgAE+wRGetlR8tv3MgJm+uJxY= X-Received: by 2002:ac8:5a8c:: with SMTP id c12mr1997939qtc.424.1642039005796; Wed, 12 Jan 2022 17:56:45 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:45 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:55:59 -0300 Message-Id: <20220113015612.448-18-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 106/281] musx: 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: +tEnP62Y2fYf From: Anton Khirnov Signed-off-by: James Almer --- libavformat/musx.c | 49 ++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/libavformat/musx.c b/libavformat/musx.c index fd5a9297f9..edb65ccf86 100644 --- a/libavformat/musx.c +++ b/libavformat/musx.c @@ -68,30 +68,32 @@ static int musx_read_header(AVFormatContext *s) offset = avio_rl32(s->pb); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; - st->codecpar->channels = 2; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 2; st->codecpar->sample_rate = 32000; - st->codecpar->block_align = 0x80 * st->codecpar->channels; + st->codecpar->block_align = 0x80 * st->codecpar->ch_layout.nb_channels; } else if (version == 10) { type = avio_rl32(s->pb); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; offset = 0x800; switch (type) { case MKTAG('P', 'S', '3', '_'): - st->codecpar->channels = 2; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 2; st->codecpar->sample_rate = 44100; avio_skip(s->pb, 44); coding = avio_rl32(s->pb); if (coding == MKTAG('D', 'A', 'T', '4') || coding == MKTAG('D', 'A', 'T', '8')) { avio_skip(s->pb, 4); - st->codecpar->channels = avio_rl32(s->pb); - if (st->codecpar->channels <= 0 || - st->codecpar->channels > INT_MAX / 0x20) + st->codecpar->ch_layout.nb_channels = avio_rl32(s->pb); + if (st->codecpar->ch_layout.nb_channels <= 0 || + st->codecpar->ch_layout.nb_channels > INT_MAX / 0x20) return AVERROR_INVALIDDATA; st->codecpar->sample_rate = avio_rl32(s->pb); } st->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4; - st->codecpar->block_align = 0x20 * st->codecpar->channels; + st->codecpar->block_align = 0x20 * st->codecpar->ch_layout.nb_channels; break; case MKTAG('W', 'I', 'I', '_'): avio_skip(s->pb, 44); @@ -103,30 +105,34 @@ static int musx_read_header(AVFormatContext *s) } avio_skip(s->pb, 4); st->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4; - st->codecpar->channels = avio_rl32(s->pb); - if (st->codecpar->channels <= 0 || - st->codecpar->channels > INT_MAX / 0x20) + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_rl32(s->pb); + if (st->codecpar->ch_layout.nb_channels <= 0 || + st->codecpar->ch_layout.nb_channels > INT_MAX / 0x20) return AVERROR_INVALIDDATA; st->codecpar->sample_rate = avio_rl32(s->pb); - st->codecpar->block_align = 0x20 * st->codecpar->channels; + st->codecpar->block_align = 0x20 * st->codecpar->ch_layout.nb_channels; break; case MKTAG('X', 'E', '_', '_'): st->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4; - st->codecpar->channels = 2; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 2; st->codecpar->sample_rate = 32000; - st->codecpar->block_align = 0x20 * st->codecpar->channels; + st->codecpar->block_align = 0x20 * st->codecpar->ch_layout.nb_channels; break; case MKTAG('P', 'S', 'P', '_'): st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; - st->codecpar->channels = 2; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 2; st->codecpar->sample_rate = 32768; - st->codecpar->block_align = 0x80 * st->codecpar->channels; + st->codecpar->block_align = 0x80 * st->codecpar->ch_layout.nb_channels; break; case MKTAG('P', 'S', '2', '_'): st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; - st->codecpar->channels = 2; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 2; st->codecpar->sample_rate = 32000; - st->codecpar->block_align = 0x80 * st->codecpar->channels; + st->codecpar->block_align = 0x80 * st->codecpar->ch_layout.nb_channels; break; default: avpriv_request_sample(s, "Unsupported type: %X", type); @@ -136,23 +142,24 @@ static int musx_read_header(AVFormatContext *s) type = avio_rl32(s->pb); avio_skip(s->pb, 20); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - st->codecpar->channels = 2; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = 2; switch (type) { case MKTAG('G', 'C', '_', '_'): st->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4; - st->codecpar->block_align = 0x20 * st->codecpar->channels; + st->codecpar->block_align = 0x20 * st->codecpar->ch_layout.nb_channels; st->codecpar->sample_rate = 32000; offset = avio_rb32(s->pb); break; case MKTAG('P', 'S', '2', '_'): st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; - st->codecpar->block_align = 0x80 * st->codecpar->channels; + st->codecpar->block_align = 0x80 * st->codecpar->ch_layout.nb_channels; st->codecpar->sample_rate = 32000; offset = avio_rl32(s->pb); break; case MKTAG('X', 'B', '_', '_'): st->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_DAT4; - st->codecpar->block_align = 0x20 * st->codecpar->channels; + st->codecpar->block_align = 0x20 * st->codecpar->ch_layout.nb_channels; st->codecpar->sample_rate = 44100; offset = avio_rl32(s->pb); break;