From patchwork Thu Jan 13 01:55:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33383 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp26526iog; Wed, 12 Jan 2022 18:14:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwXEgJIgnDXultiqqOqEiIUCxFfNwkMijG+FckRMsR2LUd30txbMKz6bMRWdC7KKMS5yc2M X-Received: by 2002:aa7:cd8a:: with SMTP id x10mr2290895edv.3.1642040075065; Wed, 12 Jan 2022 18:14:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040075; cv=none; d=google.com; s=arc-20160816; b=q9bIgg7hW5UzosZzL4jeEe14fX3P1tPLaaLHRvU8tojWPqbw73BdKXi+/uJdFen780 2RU0kKZcXWDEoJsToF4gT6q7k4j5PHQhVPY3doPUFsjAiBWrPe+x+Dt/Rx4ARKFETdTG KeliAtn5meQviBzKsuV7Q+uaJ69K7RtHFpHnj3znUbHmvoiAieVQ0AqsqsRDzFJ1ud30 lPZDuXMLWshnzMD538upYQml5gF4cG17MVUgSXYhF5Fcf8+Igx3nS3esYZl+1JBgFg3L LKcnSGcSaVfkqbwwjARSe788IhyQ70I6zcnsdAiVyYDv7IxJXqdZb48gr4+dJ7SMZfDQ R3GA== 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=BPRNLMHmUTgX5krTrUoEEGayKEknGSRRr18jashogrY=; b=wxLsoaYSE+bVGhNPRebSh+/sKoQJapKhwlJ3qqLNBxqbtHl+MXfvKTQH6PClgIFGYK JmVXDm4VQAGz053HL0JibglvCiUd6VTICZpQC/J6mvg/1avitspD/8bUlTIGYMXYbhyc FQM54XW9fhxzqCUmo+z7QqhlUWPc3zzboer/AnR3fLVs1VEzTVcdze3vYPqX9Wou5o0Z Blk9HB/a1NrF0oCVM7e7dLVX7TZXaJKiVbTGObK7RW1SHX5YkAvqqV4euNiUsNETVGLC MqYTNIVsadKegS5gG9x5vU8cgFLqPOOTLIpGt9hh0lozwL+21dNIJQMvIDGU3u78OTir TcsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=GiSOmYUq; 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 ds7si1096642ejc.642.2022.01.12.18.14.34; Wed, 12 Jan 2022 18:14:35 -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=GiSOmYUq; 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 79A7068B27A; Thu, 13 Jan 2022 03:56:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f179.google.com (mail-qk1-f179.google.com [209.85.222.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7E5C68B279 for ; Thu, 13 Jan 2022 03:56:44 +0200 (EET) Received: by mail-qk1-f179.google.com with SMTP id 82so5544822qki.10 for ; Wed, 12 Jan 2022 17:56:44 -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=x04NZF6BtQv/93m8Q1MaErTzAoJ0XJzPIciBtEFz3dU=; b=GiSOmYUqEhoMSVxngppebRk1Hv7oOMPyqiwHeng+C/ajnKM8hcx00Apvpmy+GLHFKH 5+6F6Q7kUhg3tgUs+9Qm0Gd8c61mzlohzQHO28gRSP0WiBZRYB1k32xbS4o7AJXPgLsq m4VbxISY1TC9K83nJEbLT4TBNg42WLGBeZlNx6RMwaQFTMwqafula8vSivjByDztSuC/ T25BKOpF0HfLcvcuM2V6husqG+UXOEqSGRk7XUUCTWX6VBfZXL91ayM6AYTMwz7RdfV9 cw4BFzRj04d11H8hmVwUNbIYtPdF6wzSqFqwP4/Pn4pVwechO+Mb+9zLWMO4uObsjCyg PgTg== 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=x04NZF6BtQv/93m8Q1MaErTzAoJ0XJzPIciBtEFz3dU=; b=pprJrbBSNDjCAzgM9Mdz4zGz3RBKy+gO6Ia6ClcKFXxaD91ahQTmDEWtxzYYkigqwn aYN6z4IXzNQQjTo4IN8KecrdPOXEqNOJVczpzbFrWmO6AArLiGwOdlUBRCIjzG+Aj5ZX 2rhgDuUzD7jVIRWZ8xHzJBSzpKnqKTkfDyBOW4pA3O5pAa6mxUaVAfwmsowouUGLvE/D fs5owggBklJhU7u3gV7j79INiB7HhQSktFvHkKfVLGd8aftUa182F577BZcARugQbD1B m3XlPztewo5j6w5MSrVvyyhccIfmS59kEoawad9/wEWxnQjgnP7WJbZOcXGa3DKPdH/6 oklg== X-Gm-Message-State: AOAM533a8KwpOGSCMuzhV8art/W91b06Gtk4tGBa5YDDJX745ooJ/AYp ETn24GtJGV+DLrFuNE3Eaw0zGfl4bYI= X-Received: by 2002:ae9:ed10:: with SMTP id c16mr1814079qkg.747.1642039003419; Wed, 12 Jan 2022 17:56:43 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:43 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:55:57 -0300 Message-Id: <20220113015612.448-16-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 104/281] msf: 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: bm8s79TxdgIZ From: Anton Khirnov Signed-off-by: James Almer --- libavformat/msf.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libavformat/msf.c b/libavformat/msf.c index 98a7ca11c3..ab3812b0fc 100644 --- a/libavformat/msf.c +++ b/libavformat/msf.c @@ -54,8 +54,10 @@ static int msf_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; codec = avio_rb32(s->pb); - st->codecpar->channels = avio_rb32(s->pb); - if (st->codecpar->channels <= 0 || st->codecpar->channels >= INT_MAX / 1024) + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = avio_rb32(s->pb); + if (st->codecpar->ch_layout.nb_channels <= 0 || + st->codecpar->ch_layout.nb_channels >= INT_MAX / 1024) return AVERROR_INVALIDDATA; size = avio_rb32(s->pb); st->codecpar->sample_rate = avio_rb32(s->pb); @@ -65,19 +67,19 @@ static int msf_read_header(AVFormatContext *s) switch (codec) { case 0: st->codecpar->codec_id = AV_CODEC_ID_PCM_S16BE; break; case 1: st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; break; - case 3: st->codecpar->block_align = 16 * st->codecpar->channels; + case 3: st->codecpar->block_align = 16 * st->codecpar->ch_layout.nb_channels; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; break; case 4: case 5: - case 6: st->codecpar->block_align = (codec == 4 ? 96 : codec == 5 ? 152 : 192) * st->codecpar->channels; - if (st->codecpar->channels > UINT16_MAX / 2048) + case 6: st->codecpar->block_align = (codec == 4 ? 96 : codec == 5 ? 152 : 192) * st->codecpar->ch_layout.nb_channels; + if (st->codecpar->ch_layout.nb_channels > UINT16_MAX / 2048) return AVERROR_INVALIDDATA; ret = ff_alloc_extradata(st->codecpar, 14); if (ret < 0) return ret; memset(st->codecpar->extradata, 0, st->codecpar->extradata_size); AV_WL16(st->codecpar->extradata, 1); /* version */ - AV_WL16(st->codecpar->extradata+2, 2048 * st->codecpar->channels); /* unknown size */ + AV_WL16(st->codecpar->extradata+2, 2048 * st->codecpar->ch_layout.nb_channels); /* unknown size */ AV_WL16(st->codecpar->extradata+6, codec == 4 ? 1 : 0); /* joint stereo */ AV_WL16(st->codecpar->extradata+8, codec == 4 ? 1 : 0); /* joint stereo (repeat?) */ AV_WL16(st->codecpar->extradata+10, 1); @@ -99,7 +101,7 @@ static int msf_read_packet(AVFormatContext *s, AVPacket *pkt) { AVCodecParameters *par = s->streams[0]->codecpar; - return av_get_packet(s->pb, pkt, par->block_align ? par->block_align : 1024 * par->channels); + return av_get_packet(s->pb, pkt, par->block_align ? par->block_align : 1024 * par->ch_layout.nb_channels); } const AVInputFormat ff_msf_demuxer = {