From patchwork Mon Sep 25 11:49:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mezhuevtp@ispras.ru X-Patchwork-Id: 43893 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp1164590pzh; Mon, 25 Sep 2023 04:49:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrC+CafZly6H12TuCFvBSEnyKXbbVwilDG+eQ575SI/EoIbs+iBihlcoGmTlB0NhvShI1X X-Received: by 2002:a17:906:8468:b0:9a1:b528:d0f6 with SMTP id hx8-20020a170906846800b009a1b528d0f6mr8171116ejc.27.1695642578716; Mon, 25 Sep 2023 04:49:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695642578; cv=none; d=google.com; s=arc-20160816; b=mGJuZxlhKJsdIj3FHzTkY/7YgI9H5hsc1GVb1F5GxGamT6BfOUrmsSgrmJZWrv/OvE QSbZ1xw8OF140QpGQXcYj0yuA2w5I4a7faafRvuUrsn2GONXDf6VEaQSGGx1NFPa6nHt lD4PaOYmWoF9uEVfnfAPDAP2WKUpsGIywM9HHCyd3EdI4K6q7eTMpFyT0v+XugS6aRYr CkpCqxSSuyXpvSc36k6+wkSmAFq6aCjPnG6sZRdg/5yFdEkiFAlw0RoVVJDm8XcB63iM 3j/2dTFWtqLygGnYRuL8EEw2viCnhnaOpVRWUWSgz2hkYqV3mrez4M8NnjAi7ZwXTmFq 9u3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:dkim-filter:delivered-to; bh=ZY4+DqW3ks36OHyKGvPa7l8GohHH7V5i3ajCTODHfJ4=; fh=N5ZEAcbS/qNmXhnh007L0O2hfBv3whDN0oICTLe1blQ=; b=Mgg36rQGWDEWsWskoeCOMwm20AX1eiXkjLaYP0SuFgX8gqDWPLbBxJrAFzT0bvtC5f cE5Zt8KasE8gbaQGRVMAs4iq9gPioRXh8siUuGGy/TquwJgs8jhAGyChYgoz0ug6u1of bj5agCei42KMOMqAT5vzw4FkMwaIVT/ix14q2MbEN/i1sI2bkA+3ZPYuEzIM24RP0Cep IK2Nap3k5lg3WfMMojNu4pplXqUklqdAusmBE+w3YWOYN2buCuByUGPBwS67BS/E1LbM WBuLLadZ2Mg3MXLATv9DN1ZNiDhflrcTJ/RamRaQF1TtgiFSARqOEObpYZOrmV1gr1GN X9vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ispras.ru header.s=default header.b=GePR9nkg; 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=NONE dis=NONE) header.from=ispras.ru Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q11-20020a170906a08b00b0099bc9dfa042si9612084ejy.470.2023.09.25.04.49.38; Mon, 25 Sep 2023 04:49:38 -0700 (PDT) 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=@ispras.ru header.s=default header.b=GePR9nkg; 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=NONE dis=NONE) header.from=ispras.ru Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 52F9068C95A; Mon, 25 Sep 2023 14:49:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39D1D68C60E for ; Mon, 25 Sep 2023 14:49:29 +0300 (EEST) Received: from nick.intra.ispras.ru (unknown [10.10.34.56]) by mail.ispras.ru (Postfix) with ESMTPSA id 813A540F1DED; Mon, 25 Sep 2023 11:49:28 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 813A540F1DED DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1695642568; bh=xSqiMIVhlbkDJHRkyIlOZM7JX2vCpObjnafJ5fIUobg=; h=From:To:Cc:Subject:Date:From; b=GePR9nkgdKLguE4xpy2US2yyFY7fYZ5EDfoHHjrIgx9kS3EPlF20yfKhLY2LlIYtz BwVVRB28N3GML9IDtME/XcU43H6Go/Lrxil9wmZVsOdDJ5XyvuHIZFUxl2M2r3Dm4g o2PYV5cNENsJC1dkZMamXg0Kp/5t5FgRE7oatDlY= From: mezhuevtp@ispras.ru To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Sep 2023 14:49:15 +0300 Message-Id: <20230925114915.4043954-1-mezhuevtp@ispras.ru> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/svs.c Fixed, now it is in the right place. 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 Cc: mezhuevtp@ispras.ru, headshog Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vCdkkFcf2ITp From: headshog --- libavformat/svs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/svs.c b/libavformat/svs.c index b91d29f5a6..bdfb856184 100644 --- a/libavformat/svs.c +++ b/libavformat/svs.c @@ -42,6 +42,7 @@ static int svs_read_header(AVFormatContext *s) { AVStream *st; uint32_t pitch; + int64_t rescale_val; st = avformat_new_stream(s, NULL); if (!st) @@ -51,10 +52,14 @@ static int svs_read_header(AVFormatContext *s) pitch = avio_rl32(s->pb); avio_skip(s->pb, 12); + rescale_val = av_rescale_rnd(pitch, 48000, 4096, AV_ROUND_INF); + if (rescale_val > INT_MAX) + return AVERROR(ERANGE); + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; - st->codecpar->sample_rate = av_rescale_rnd(pitch, 48000, 4096, AV_ROUND_INF); + st->codecpar->sample_rate = rescale_val; st->codecpar->block_align = 32; st->start_time = 0; if (s->pb->seekable & AVIO_SEEKABLE_NORMAL)