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 ESMTP id 93977471D0 for ; Thu, 28 Sep 2023 09:48:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C205968CAED; Thu, 28 Sep 2023 12:48:22 +0300 (EEST) Received: from mail-ua1-f46.google.com (mail-ua1-f46.google.com [209.85.222.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA4A168C9ED for ; Thu, 28 Sep 2023 12:48:16 +0300 (EEST) Received: by mail-ua1-f46.google.com with SMTP id a1e0cc1a2514c-7a50a1d1246so5083562241.3 for ; Thu, 28 Sep 2023 02:48:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695894495; x=1696499295; darn=ffmpeg.org; h=to:subject:message-id:date:from:references:in-reply-to:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=YrTVmzS0W4C0FFfcIg6ImV0+ztqaxKywxWkHNkEH1fw=; b=f2FnzvitfJdUwR/B7yiMxQ+X54EyoL0wXiSbICgB+yPjmJFzOsltdHS+09KBtjx91e S7887QSCtnSy6AQvgxINnt72xL2YgkvVl/Xx42482cQZfN8zzugC4T2cDvHG+DUZf+Sj bQu2DALtmseV0L+wJnZeP0bQ/KRBXzM5pSV79uPAWt5rGomXjjnD3wwRTAkfPo/rnUcb lVae7PPqHTEfbyJMqpB3XYf0cYJY3kXOtkpeoDnv2I0CUflCnh7C7ZEJFNcOlYUaYLh2 5Ecwk668kMDDwl6gRZhJ6ldOrZMmBEqE+quelE5SVnr7bQrtX0fk38MqWLEs2dANS7g+ M/zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695894495; x=1696499295; h=to:subject:message-id:date:from:references:in-reply-to:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YrTVmzS0W4C0FFfcIg6ImV0+ztqaxKywxWkHNkEH1fw=; b=hZ7+ybLhHaT/BpvQkjm1eberZ3r6c5NCNGUUTSgSpgKMMvh3zFLVA8uBuZC1qRMAEh Xc93stT9L9OO5PXrMGhP5odZVWRqtBOd5yk9iBa+5+Z7GqFmDnOytJNiLt7/YAiYnnYq RLW+WMhdiFOo94V+t5iibK3Y8BMVn6NBDvcxD30dyT9PtJU+f2UjlbQavt1Xm9/ZuMM/ OVa5vUM51FcncAOfbprWq9Ql3lguwt5YVp2fr6zKF/B8CTYEcrXVjEj6JWESQ76SGFg0 kMmCrNqsG5FmkjjKADXiGrsxifdkLNKdgnb8oyVyAS4SCWZKrRB/4lSPz5ApJwj6m9Jt wHPw== X-Gm-Message-State: AOJu0YxvrmDKR3uQ2KyrcO2gRlAF5EjbvsaGuolHWvCihJ7D+ejMuyUk PPXKfINYCmxP4Ixsimy2ZcLrqFWcGzpzgViZNgynWPrONZw= X-Google-Smtp-Source: AGHT+IH6J1mI7d/FQPM+o07qPEB01JB75nJ3HNb41rGDm6Ip2egJFqCCb0bxTSxCpKidBt6tTxE/wweTdnWlqCGqvWk= X-Received: by 2002:a05:6102:419:b0:44e:e7d7:6847 with SMTP id d25-20020a056102041900b0044ee7d76847mr626636vsq.7.1695894495033; Thu, 28 Sep 2023 02:48:15 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a59:cca8:0:b0:405:b46f:a850 with HTTP; Thu, 28 Sep 2023 02:48:14 -0700 (PDT) In-Reply-To: <169589387341.6638.15012517934493438253@lain.khirnov.net> References: <169589387341.6638.15012517934493438253@lain.khirnov.net> From: Paul B Mahol Date: Thu, 28 Sep 2023 11:48:14 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH] avcodec/photocd: allow decoding vlc with errors 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 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: On 9/28/23, Anton Khirnov wrote: > Quoting Paul B Mahol (2023-09-27 21:53:54) >> Attached. >> >> From 6b7e51e2b4facead9c45fb94647c85b58e6fdf22 Mon Sep 17 00:00:00 2001 >> From: Paul B Mahol >> Date: Wed, 27 Sep 2023 21:48:49 +0200 >> Subject: [PATCH] avcodec/photocd: allow decoding vlc with errors >> >> Also rename option that no longer works. >> Also make tables finding more robust. > > Why do all these things in a single patch? > I can boost my commits if you prefer that way. > And why are there no tests for this decoder? Its complicated. > >> Signed-off-by: Paul B Mahol >> --- >> libavcodec/photocd.c | 7 +++---- >> 1 file changed, 3 insertions(+), 4 deletions(-) >> >> diff --git a/libavcodec/photocd.c b/libavcodec/photocd.c >> index 07e8d460bd..a9e42bb86a 100644 >> --- a/libavcodec/photocd.c >> +++ b/libavcodec/photocd.c >> @@ -277,8 +277,6 @@ static av_noinline int decode_huff(AVCodecContext >> *avctx, AVFrame *frame, >> if (get_bits_left(&g) <= 0) >> return AVERROR_INVALIDDATA; >> m = get_vlc2(&g, s->vlc[idx].table, s->vlc[idx].bits, 2); >> - if (m < 0) >> - return AVERROR_INVALIDDATA; > > Shouldn't this error be at least logged? Perhaps it should still fail on > AV_EF_EXPLODE. > >> m = sign_extend(m, 8); >> data[x] = av_clip_uint8(data[x] + m); >> } >> @@ -389,6 +387,7 @@ static int photocd_decode_frame(AVCodecContext *avctx, >> AVFrame *p, >> return AVERROR_INVALIDDATA; >> >> if (s->resolution == 4) { >> + s->streampos = (AV_RB16(avpkt->data + 2048 + 1536 + 3) + 12) >> * 2048; > > Where do these magic numbers come from? Same below. >From offset from internal image file bitstream table structure. > > -- > Anton Khirnov > _______________________________________________ > 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". > _______________________________________________ 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".