From patchwork Wed Jul 27 22:18:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammad AlSaleh X-Patchwork-Id: 37017 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp618378pzb; Wed, 27 Jul 2022 15:18:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uTe4hqJiCLM7Ekp+4Ab5YPKVFL9bApDiUXcZ1xF3GZaQOCbQWOR+cEcdlo8glpePNsoops X-Received: by 2002:a05:6402:348e:b0:43c:37a:26d with SMTP id v14-20020a056402348e00b0043c037a026dmr16637519edc.279.1658960326814; Wed, 27 Jul 2022 15:18:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658960326; cv=none; d=google.com; s=arc-20160816; b=YY4IpPLuqLFGl2Gpj/oRomWttXLt7Fxq8y9knHQ5qKfWrVxMG/l1pSscIIbj9RW18Q bG8zRCLvPopa/4jNo036GI5EdoI2CileR9eoNwW1/4EnF39EEUijCzMOX9oHJTL7o1O3 x4RzVkmFn8drF1LLcrZlW8XMUd8OPGia2mWLb8PZMTU23TAXT9EWNDYgfzxilTk4hENX cmTu3bApoE3K44IKq+bLKK686hxSo6Mx/M4QGHRfirJWzIpvmQ6Sygf5/SiDBJaZxfyz SP+pKxPS7Kr5Ghjy88OToZBUOeBVp0IdRt552/qlKtWPmHxkE0sHs/E3SpGzWbGw+Vw+ n8rw== 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:delivered-to; bh=mhpB9HwTLtOe6I/aQSDQOwBZ+gpI+hr+Uwb2jPwrBwo=; b=Vuhsv2sKruISSiClZf+LP3HqlJdNtRe1aLoJ1SinFF/4x5h6F5yKTPftHf2Oj5xT2q QdbRYCJVKkxrhK5FtQX7A60N4/oYgsxxDIgdWobZ3rIDK6kcX1wcAefEpQv3FS+3ChmU ucFIPT6NKpD+1lUubes60XCSux46L98f9Sn7eyqYegvUEzBn2UBEPLDhI6KsU4SkTNjv 0vQKvFCobvyHjZUIg1AaXvzvZOzB+lTAbFRXWyKq1dIE5H3V3MmzM1a2X0fg8w8xmFzn kD3++b29JVvLOiYUC8amXyD1ioiFP33u9v0tPsbTcRdJUZQTi7GC63FQvHHIdCN2l7Fm MRdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PPKjdGNe; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qf35-20020a1709077f2300b0072b4adf5c0fsi18296434ejc.77.2022.07.27.15.18.23; Wed, 27 Jul 2022 15:18:46 -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=@gmail.com header.s=20210112 header.b=PPKjdGNe; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B3D868B8C4; Thu, 28 Jul 2022 01:18:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16E2568B7B9 for ; Thu, 28 Jul 2022 01:18:13 +0300 (EEST) Received: by mail-ed1-f48.google.com with SMTP id a89so109573edf.5 for ; Wed, 27 Jul 2022 15:18:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=4BmePKnLcg2U9gi5R3bfaveRhpZBpQK+ZvyOtomPMWs=; b=PPKjdGNe2WL/Q3/edVTMSGr9xcupfoO8q2/QaMBoRWCH6GPl2R9T9iVHVib89hSIY2 KU2Lk614NB6RvLmtnTYD85HqBZcsOc0zu+SxQfs+xj1H+Pa9isdiMQgccVv2+e5qOnOd Q1mg8dhHuuaGo+GdKhAzEKBdiyaYjuPle4ZLNnJsCyy8PMZzcyk0Fa4OEk9dtZkAESiR wqVo/MfEjXwl7i5/hHzW8L8VZNF/s1Dr3GHykNNSGLkiec9bADCmiznRhwMbHqAtQQvm BvKiyrm9fjrt+jwlzoCnuEBZVhIC3ZzzfQ5zounhtgLZf1EiYSC4W+VBCD9GbhlM6ysa Vbgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=4BmePKnLcg2U9gi5R3bfaveRhpZBpQK+ZvyOtomPMWs=; b=YhYm/2nxftwgbaDllzQCawOwZl1w6eGN0gyR2Hk6A/PiQcGyeEiL1zlDgoTKsn3AMn xNkDkaTwaCMGzaQKV1kI7Osjpq+/+rRVC/baCbdi/4zvVq13qPy3IVT9MUCd6pmFrEuI /ZSY0dwx1PHe+RtTAH6/br4LdpkYuyeujCgX/wxPpYtMYOYOBppZ9vu9+6p2uYgouO20 v5NS0GlQsD+TBYi7lgd7ezCIpIeaUNefBqPOlEh1GjFhRh+s/wGEWLTX8E4JZc2jrcN/ wp5RilcfLZ5kf5xKQWaDNjLSg8BfJfgGkmOxN04r/iDewVbpTw4lgEgq1S8s3x5UOnXT /rXA== X-Gm-Message-State: AJIora/6xsNXIX9lZu4TQGFHubR++vwxOAehqc5gGwMVyJea6hHuHJ9f 1jfNpRx6j7YKjRZvbDa/iEmpMdRljQFUxjI5m/I= X-Received: by 2002:a05:6402:2b8b:b0:43a:5475:f1ae with SMTP id fj11-20020a0564022b8b00b0043a5475f1aemr25055784edb.363.1658960292204; Wed, 27 Jul 2022 15:18:12 -0700 (PDT) Received: from localhost ([89.249.65.20]) by smtp.gmail.com with ESMTPSA id k19-20020a1709062a5300b0072af3deb944sm7963820eje.223.2022.07.27.15.18.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jul 2022 15:18:11 -0700 (PDT) From: Mohammad AlSaleh X-Google-Original-From: Mohammad AlSaleh To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Jul 2022 01:18:07 +0300 Message-Id: <20220727221807.2350130-1-CE.Mohammad.AlSaleh@gmail.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/mjpegdec: Continue if a block fails to decode correctly 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: Mohammad AlSaleh Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XAjmYJzlr1Lu Don't give up on the whole frame just because a block failed to decode correctly. Try to continue decoding if the AV_EF_EXPLODE flag is not set. Signed-off-by: Mohammad AlSaleh --- libavcodec/mjpegdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 816eb1ce5d..edefc35cb3 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1504,7 +1504,8 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah, s->quant_matrixes[s->quant_sindex[i]]) < 0) { av_log(s->avctx, AV_LOG_ERROR, "error y=%d x=%d\n", mb_y, mb_x); - return AVERROR_INVALIDDATA; + if (s->avctx->err_recognition & AV_EF_EXPLODE) + return AVERROR_INVALIDDATA; } if (ptr) { s->idsp.idct_put(ptr, linesize[c], s->block);