From patchwork Wed Apr 28 14:53:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27460 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a11:4023:0:0:0:0 with SMTP id ky35csp493498pxb; Wed, 28 Apr 2021 07:54:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOdcNLIl0P99Q49fHHugE2qaoFLUP8jRHT3vs1EWDpWYz2xmxfkhKpayzm28xZD4lZYro7 X-Received: by 2002:a17:906:b7d3:: with SMTP id fy19mr7880313ejb.269.1619621644449; Wed, 28 Apr 2021 07:54:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619621644; cv=none; d=google.com; s=arc-20160816; b=Ntmh10UaAu4gCGvzU3WeCk0iqj04Uo3/dEpYUduvICGVUfRhtL4Zqd3Xe95IZmAqln FjREI9L/jEnZ/x1jH9I0y0EDTknFYGoUgitCQl36O8YBtp6OTjqEwLX/Za/U415HPMyH TJqSTWHcC6Z7VNO2188b3O3X/G7+l8WEE3pNvobKGFKBpTaa8jx6bA9xT20I4+byKo8L 3X4nEQNWghd9R0wGy4ZTHIeYtI1OiiYOGHKK5mnmrIQT/mJyKhIgdcHhLtatIfKz7Kzr nVisaYinSoKzCDNCR8F5NbuzNSpCicnvDQGGbYF+ck81mR+4b3qs2Psl7wnZQ+Szh2DN YOOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=V3GL4BoEno+xCe4qnpmTveITfB8pJzgSNrXccIYOgNk=; b=rY4MmxSdTdltpaChtzqqlNtYuhPZJo1TbyKc7Jq4gji0eNayLpVhLZ9WIi6vAIPIme 58BOu9+UnvCg/6atce9IukhanCXWhzPa2rjuV0VIUjDp+Ioft6MURB6M7uCpg+MStaS5 +pygyxIv7mhOeb6eu/+a4rR7wiHVd73Lc9tSSheMgINQ6N+uKAtSETtGoIfAECNPaNnW v8fju4O/BFEO9HdGNyiz6ukQVTDfaHu4QpxGBtEvp9H/N2/pAlShweRLLIm2ibERcYnw 7DOjTJr4/hu5c+/sptnBnBcQNi491DmtIYSu6X7xsQYZwTaC/UkzYbid+djiQ6O7j+Is k0jQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=XDBexF8i; 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 k1si212060ejp.353.2021.04.28.07.54.03; Wed, 28 Apr 2021 07:54:04 -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=20161025 header.b=XDBexF8i; 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 DC4ED68A1EB; Wed, 28 Apr 2021 17:54:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F07A6897BB for ; Wed, 28 Apr 2021 17:53:54 +0300 (EEST) Received: by mail-qk1-f181.google.com with SMTP id i12so32230288qke.3 for ; Wed, 28 Apr 2021 07:53:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=5K8RJioaPQGlok7sHXtVkk3BnfNWNqtHP91CVd+JsS8=; b=XDBexF8inz1NorbmCdV8Ua7sIp1+if/qYr7qBrSkmRiWT0YTLAIsJgGMOd+c8Hpr5r Ingpkb5FypPjDHEC6xjX9YysMee038YlulrvHfmcTlVfznvpHQHv0JMbtMv8nRk+rtzN 9XFzmKGeGcZpJ9UUjw4Jw43+bGivL/TzFf7sBo6ZKCElOZ45REiyHupDpKg0no8AhAbP Ht9Q2h+QZ26Qc1VwXSeET3u6A7/Fj3hw6m0jagSi5dnY+BBD4FTBFv6aExAaxEGduZYR UEnhygMgZbjkCpnDAhhlCLH1OIB78Gn9cQ6/zeehgq1K6owWXpQTuejR5DbhD1Le1lf2 QrFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=5K8RJioaPQGlok7sHXtVkk3BnfNWNqtHP91CVd+JsS8=; b=WHbQpGPT+qaF0hzpWRSzt/SZj5MVvbLoNrWGYWliTV1H46YnebWOLR36U9seaVth8V sweCbLDohzCADLyGlEnUTBFmORU+Tkpl5mBFdfIA/yBDOlxQJknqr4522WQY+lAvaGo/ EPTdgN8HjuxhWrL6ElvN4wisMY4BfqIxumSyfkUtgEzt0rng3oPl9JwcCUuAXW+UAmK8 RhMkltNLInZl8sHFO/mUQSMKv/ejopG3PADaHkx6lYetCMoWjzl+pfoN2WVoMdxTg9V+ vU0Q8U5+lsmZJCyke5tgpiQLpV7tG7AC6hT0QZ+1+ibLqMldKceOUwxxcc79J9Ss7W/x DQnA== X-Gm-Message-State: AOAM5314sdFtvI6DRINhKAx+UfPooOGml/Zym9mVLluI7N8+4OHWphSx OLN48QII/VqD8TmYx6xUUZ0+ZOso1fg= X-Received: by 2002:a05:620a:210c:: with SMTP id l12mr29284468qkl.421.1619621632222; Wed, 28 Apr 2021 07:53:52 -0700 (PDT) Received: from localhost.localdomain ([191.83.208.172]) by smtp.gmail.com with ESMTPSA id t5sm5108314qkh.92.2021.04.28.07.53.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 07:53:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Apr 2021 11:53:09 -0300 Message-Id: <20210428145309.10112-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/mjpegdec: fix SOF check in EOI 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fyWGrr/JPX6f For frames decoded with skip_frame == AVDISCARD_ALL, a picture is not allocated and got_picture is never set to 1 even if a SOF and SOS were parsed. The existing check in EOI only cares if a SOF was parsed, not if a picture allocated, so change it and add a new check to explicitly ensure a picture was allocated when skip_frame != AVDISCARD_ALL. Fixes probing and decoding when skip_frame is AVDISCARD_ALL. Signed-off-by: James Almer --- libavcodec/mjpegdec.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 16aed078f6..c829172200 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2560,11 +2560,16 @@ eoi_parser: s->progressive && s->cur_scan && s->got_picture) mjpeg_idct_scan_progressive_ac(s); s->cur_scan = 0; - if (!s->got_picture) { + if (!s->seen_sof) { av_log(avctx, AV_LOG_WARNING, "Found EOI before any SOF, ignoring\n"); break; } + if (!s->got_picture && avctx->skip_frame != AVDISCARD_ALL) { + av_log(avctx, AV_LOG_WARNING, + "Found EOI before any SOS, ignoring\n"); + break; + } if (s->interlaced) { s->bottom_field ^= 1; /* if not bottom field, do not output image yet */