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 445E74BB3A for ; Sat, 1 Feb 2025 10:41:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7517A68C2DD; Sat, 1 Feb 2025 12:41:30 +0200 (EET) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E9D868C2BB for ; Sat, 1 Feb 2025 12:41:24 +0200 (EET) Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2f83a8afcbbso4278931a91.1 for ; Sat, 01 Feb 2025 02:41:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738406482; x=1739011282; 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=mDah2UgGzpJl0Jf4Ip9YhNJ/FVRefcNCpm6TIIqxe5s=; b=doqEuhhBrwXwjs1s2ruywroV9ibCMtMLvqhazV7WrN86eot0umNe8Huplg6qemWnSm jOOwjEZ62QyZf2G7UM8LsOBUF6JYEiJk/FO94Z8qGzlV0pbBfkeXOQ7Drm8joEoi6v0P bofwy5LQ1Jwou6I1sVIJKJfDTjOdH/RqEeaqNI878B8GwuYVK6LdqgUlvyFJw+2zDlY4 yJmb21/qDs2+/ugNIPk+AcwyF2sqCaQcItyCiUJaLgGlLnM5ydTgv4HhfTHOnX7u+iY2 IRRKoZAfW1XSSSoSAXiMZk5nXILDcGDsfBzgZpgvst0cvzhOZOxmSqKr9hZN821l2+hj FzcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738406482; x=1739011282; 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=mDah2UgGzpJl0Jf4Ip9YhNJ/FVRefcNCpm6TIIqxe5s=; b=hBCVxhBC2VovROluMyG5NIoav2GYMM+fovGbQL010XIXgGkesrQ4H+90fZquEIiWW3 rKB8KNQRIq/P9SZsfm1LVVnTbhtttelg7Cv4cHP0gk6WkR5Ir+rQwWNlwA3gJNP8oQ6D RcY/SI9OBmen6lPucWtQvJOeM+aBery9Xf4ru3lWcOcQ8NAQd0e39QxLpR2Az0DAZO8q Xf7iZaNOKPU6aHr57t3OkyNz/X5CNr7MCondvIIYecsvvD+vjdiT5EvHDnmSGM2y5b5X PWQcDuDKMus1V4SkHq2q6InGWPApno7J7AJP6V10DS5Ai7fF90pGOqaRlcSymw6Ds4GD nd9g== X-Gm-Message-State: AOJu0YyT3DlrLrm0ud+47ajPVuYpNPRBZ4dlYlRq/vMa4eamUMjCb4BL GMoqLVRiDzGtgIpcamnVUVU7Jr9/PhPqbe8el+Z+lg9BYhGkPc/9TnH/sw== X-Gm-Gg: ASbGncu/KbXH2IvBHvP2m2JcQQhVN7rizDIZCo9BukQAxP0zc5S63zcfdpFnZiOE3Ya Gx0oaCML6nXBr+gkawXeIszUpC9nPGXDeBoKYGu3XwUNVTQBWZnTKiWB0LxmujaVvHL8UM0JMvh Sgm9j94+AcT9/fgptP3TpseDKplRCeyDYKz7xqMpB33oXsz+HQcpICyrpGkAfLawt4L5qJDObiO +ge3tquHiLoMX3BfUscvFncuDQKfSIya4bBIL4CjtSJ+1h3gLvXy3RtmX1SVjVXR9OK0NjFUm6m n/7TtA8HNNIwgHXRVqahhb0X0XThGnM96Gqh+XyniQ== X-Google-Smtp-Source: AGHT+IElFlsoMf737zqVGC5ZsLj9w9t/55lNZ+s9mb5ki5MhJUyoTUhxmUh1Rfe+/8DA+iu35eX9fA== X-Received: by 2002:a17:90b:2dc7:b0:2ee:9229:e4bd with SMTP id 98e67ed59e1d1-2f84633eaeemr16808502a91.2.1738406482152; Sat, 01 Feb 2025 02:41:22 -0800 (PST) Received: from debian.login.wijungle.com ([117.250.157.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21de31efbcbsm43489545ad.30.2025.02.01.02.41.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Feb 2025 02:41:21 -0800 (PST) From: Viraaj Raulgaonkar To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Feb 2025 16:10:57 +0530 Message-Id: <20250201104057.1615411-2-viraajraulgkar@gmail.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250201104057.1615411-1-viraajraulgkar@gmail.com> References: <20250201104057.1615411-1-viraajraulgkar@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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, then warn the user of the invalid sample rate instead of returning an error. In certain cases the sample rate can get decoded later on during demux. 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".