From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id C72134BD3E for ; Mon, 3 Feb 2025 04:25:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B25268C097; Mon, 3 Feb 2025 06:25:33 +0200 (EET) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 35EB068BD0A for ; Mon, 3 Feb 2025 06:25:26 +0200 (EET) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2163dc5155fso67703525ad.0 for ; Sun, 02 Feb 2025 20:25:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738556724; x=1739161524; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k5RRKBLRgapxpZbTLF+oGzaqhudZfZ6iVkuoOuR6IMc=; b=EOEn7EpnZ3MGNlKTmCMuANHd4oAdf6Bk8O/eid2cqVfIrwFQ+esaoIsuzRZeV46Gx5 YejeBmZwcnyvekN4FjjufRBcPSRQ34EplpIqvd54QUt6uhbg52uKR6ZWF3t7jrBBPkr5 tNndaQh4yrxOHxsVyBDzfCnwrxTsWmTpLt77Uq0tqMeh8lHtZINKIiYaa34RPA6m1Djl OYvO8L57QyTG7ZoQp2bQYSypFUFsBIl4uNkxG8e33X7NIF4mMSNli8/k34E/6Ga7QtCU RcAGNdiLJFIAyiPS4GiKhdd+f98nqqHpAu+MExUqww+5Ejs+K3KwMZ8+QOuyDWXGq8g6 RXYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738556724; x=1739161524; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k5RRKBLRgapxpZbTLF+oGzaqhudZfZ6iVkuoOuR6IMc=; b=kCHPNpCQy3xBqL9zl+XYWnycpQjWJ0AdxjCtqb/RDG2t+4Qfsyw9I+3lvZKAa4p6DH Fc5ReCL3LjmRcvYDddIgIbk7D5g2hDd+jSC9EjRIT3DrezZ4jslE1BNJyiyzbcaZEYmw fLKt07PmlEt6kwrByvlgazZ4DwcjO7rdby75u9I2oNRjVwMRPZxlC+OLwR+BXAe3XzE/ WaavITdztPtLUsLLYeMl0vKX/AIag4Nv2Rm2eXW5R4HJrHQUVnKeQ//YjseB3jojS80A VxIEX+c/6q8z84NRd44VUqsxIPaN7Bd0vaaOVvePskqvWtGdoqGDL5/SjGhatDBAErSN 7z6Q== X-Gm-Message-State: AOJu0YxIeRNIEYlyJ5VgKwhUC8xGF/w8jEhKEtMZm/tQmlRuD6yLYrex SaRroAntPy93kn9VkN07N8QfCztIYzEIXh120SoRuQK1zVWNWIgVV2XWsg== X-Gm-Gg: ASbGncvPFMH1W19G65KavX7rLTixUl+i8bhb59ksXJ158cbxka7MJ18QmjDNUcc6/1z 1G81i69Zy1mIhE0Mbh6vnvG7wFx23z/RtkIw6vaCS6g4P7vCpCkcvGw5r9lZjdEVnCHAsTQi3PE 0H/mywa2XAirBkHOMOa3AChAYUuXaVJcHPoxz3E+Hd9U5QHJ3+DdwQUTfs8yT3yIAX5VdVvCq9l O5SQhVacsO3tfCnKtbUJI5uet9M7g38HayDpZdt5ECTvPgO2qfY+JuBGreQEeBG5uIVKR0KaTnL 2TvH4rRF0suyoS0P6n6nCqUJTBQ/eH3D0j0p3xY2iA== X-Google-Smtp-Source: AGHT+IFPPrsqm1pYSjr5QcCLuqGVAuVLsLAqLJOh9Wz7lesyXdxC4oTLvATOoeUmehV6U9+VeXD6CA== X-Received: by 2002:a17:902:c40a:b0:212:63c0:d9e7 with SMTP id d9443c01a7336-21dd7b61a82mr332416865ad.0.1738556724167; Sun, 02 Feb 2025 20:25:24 -0800 (PST) Received: from debian.login.wijungle.com ([117.250.157.211]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-acebe3845e6sm6903851a12.22.2025.02.02.20.25.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2025 20:25:23 -0800 (PST) From: Viraaj Raulgaonkar To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Feb 2025 09:54:58 +0530 Message-Id: <20250203042458.1863121-2-viraajraulgkar@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250203042458.1863121-1-viraajraulgkar@gmail.com> References: <20250203042458.1863121-1-viraajraulgkar@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 2/2] avformat/riffdec: warn on invalid sample rate 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: Viraaj Raulgaonkar Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: If strict_std_compliance < FF_COMPLIANCE_STRICT, warn the user of the invalid sample rate instead of returning an error. In certain cases the sample rate can get decoded later on. Fixes Trac Ticket #11361. --- libavformat/riffdec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 2b269b1682..a3eee43a41 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -180,9 +180,12 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, par->bit_rate = bitrate; if (par->sample_rate <= 0) { - av_log(s, AV_LOG_ERROR, + int strict = s->strict_std_compliance >= FF_COMPLIANCE_STRICT; + av_log(s, strict ? AV_LOG_ERROR : AV_LOG_WARNING, "Invalid sample rate: %d\n", par->sample_rate); - return AVERROR_INVALIDDATA; + if (strict) + return AVERROR_INVALIDDATA; + par->sample_rate = 0; } if (par->codec_id == AV_CODEC_ID_AAC_LATM) { /* Channels and sample_rate values are those prior to applying SBR -- 2.39.5 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".