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 2A94B4B835 for ; Thu, 30 Jan 2025 16:24:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5EA1468C05A; Thu, 30 Jan 2025 18:24:30 +0200 (EET) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 300C968BC65 for ; Thu, 30 Jan 2025 18:24:24 +0200 (EET) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2162c0f6a39so39536755ad.0 for ; Thu, 30 Jan 2025 08:24:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738254262; x=1738859062; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=XNBTJ6FSm+7eAZXTJRH8L+SXIihrG7ZvtaH15sV+95w=; b=exhnfzpPZop0O4mnxUHGCFSqvi3+/nVLh3iIfcaqOYxRU3tCGm+0fClP66Pk9kpTx6 asgfZfWolWvXP9EL5RJvCgo6JyXpnLnKfMo8rJCAxiYzgzCXfPrnjBBKKoGSQyl/qEId XQySHrXsIMTTR/zi6d0TEyyI/i8uhro6jEG01660Dp7Ac1e2fNCqVZrXxJf9rkdKyXLx oJS935vIs4FflDAV09k1hIgvGMXTlttxhOXdAndrl4qJaraFAYv4XqvzpRPzo3eWyH8p K8t0GoZdx+4YH6YT1uAaAIeFzhhJ4hlF3My1zBuaiweyTW2GAWYTMyV+LmWogr4zpjPD gCyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738254262; x=1738859062; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XNBTJ6FSm+7eAZXTJRH8L+SXIihrG7ZvtaH15sV+95w=; b=n9aGk5PhPGknWasREY20WD/v2/FBdn697rcyVkbnsFWkdF4D9N3iO9qZMLPzrGRfEE nJDdPxzCsoGrO0LrdSzuCHrSed0M6rThbyaY/rtHd5YH0ritPfKBTYmCBHmu9AI6C6Jt sEfKyw96WpH1hHRLZxMwX4T6J6l2jCevXM/MMZjsXDmb2BeodLTx2ajiaWfDBThRdeZ3 zq7s5Hr/L+dpAnmrABumCtmIm6ZxLLs14j9lz1VvS6hY5bIViSDq6mGVoRaJo4Faw23a wJ6COoYEx80fmJa4CHmpLD5JlCLb2tSPtxzSeTxy29JrH8r2e4SbhNmu/WOUwCJGTMN1 iMOw== X-Gm-Message-State: AOJu0Ywwee6KmT6LWr51ZrSsk7s/tZ5uuLHmbcbimNp2n//mu6DyxqG3 e4qJYH9xR96fe+mfrFfvR7SLqrQtXMMFQo6nJdwv60S8z5u6Mg1+LQyhzw== X-Gm-Gg: ASbGncs1s1+j8adPAcSEtowsUk6l1UfNB3R2sp/MQXZG1hzrP9imwe55miHUC0ft8vh UfntCIPz8C8ltRz3bbyY77rtl6wgu4bLTwX2TYcXd6U0Fq1WJD4raJPiv/QCOyXVV1Zjn+PCryA aUN+1YMJWF+MUqvwVtHlScuxcYkCH69HgPyO1i/4hsPNjluNZrA9DO5lgu7EjrKPgd0jVPO4c7j Y23MYM4G1ylR49TIPp8xt8M1Z95R0MKo0aCvy52C8B8859PYGv74ZYtsSBo3MFttrpoHPh+1WeN kMJBzn2LjwV5WYDBY0YEHKoEkgMDj7UN5MxD X-Google-Smtp-Source: AGHT+IHsgZJBFF+OBomCuZnnp7rIpPhsJXzVKsshCD+i00lCPcGw5nMCBu4/b+rlC9XcGI5gKHw7vw== X-Received: by 2002:a05:6a21:8dc2:b0:1e0:d5be:bf75 with SMTP id adf61e73a8af0-1ed873b6eafmr5515516637.17.1738254262021; Thu, 30 Jan 2025 08:24:22 -0800 (PST) Received: from localhost.localdomain ([2401:4900:51f6:3bdf:cbd9:1bfa:2c3:e84e]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69ba489sm1662344b3a.99.2025.01.30.08.24.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jan 2025 08:24:21 -0800 (PST) From: Viraaj Raulgaonkar To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jan 2025 21:54:04 +0530 Message-Id: <20250130162404.1399574-1-viraajraulgkar@gmail.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] 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 std_strict_compliance < FF_COMPLIANCE_STRICT, then warn the user of the invalid sample rate instead of returning an error. This allows the sample rate to be decoded in certain cases. 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 b7a85a6ab2..1f4cacf1d5 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -180,9 +180,12 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb, par->bit_rate = bitrate; if (par->sample_rate <= 0) { - av_log(logctx, AV_LOG_ERROR, + int strict = ((AVFormatContext*)logctx)->strict_std_compliance >= FF_COMPLIANCE_STRICT; + av_log(logctx, 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".