From patchwork Sat Aug 10 22:19:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: velocityra@gmail.com X-Patchwork-Id: 14400 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id EB98E448F16 for ; Sun, 11 Aug 2019 01:20:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DC42F68AC1E; Sun, 11 Aug 2019 01:20:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95B1F68ABC3 for ; Sun, 11 Aug 2019 01:20:21 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id p74so8969443wme.4 for ; Sat, 10 Aug 2019 15:20:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9uyRg0sw29/HwqjAdaMx0tOOYw5fvnAeMYECnUxPHT8=; b=lckGKMmDkARTE+iqGcb/c+ktIDX+4BL8j3hz/JvuLYTPpIYTnGWC94WnCmrTGvRToO vy9S0i5djIJlyrsZV+1jbZXGrJgq0WSz+J6OlU2el0lYP1mfvdbQssTGluUlFl/tDNe+ +XylXSC603WACALyYnf85Tej+NI0mruv3nd3N9qbDDylaOlKLP4EnxZN3h5qsHnOqvg4 iQc4tN+MSEyTrJrlgwj1U4lFgU8dUglz2yooLJlxWhY9UYy2xl0UYFpiSqa4rF/Jwux7 ctJlA3oBz+3GUiIe2bdCkti8yRtKX8JTWa0q0nchbqKsVbg69iegID9b9MUe3X8ZceHh MPkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9uyRg0sw29/HwqjAdaMx0tOOYw5fvnAeMYECnUxPHT8=; b=gjXjLB3qptA4wtZsFzdf5IBvICPCwIuUuPrvmUhmivL+pVLU0+O7BRoTl+quaTKyle 824YvnwDUnzcIw+uSClUEqjfVuiPFfdABerpcVBGYxu1cxROXQedQ+0zEeI03s+TZ/Tt I4YaPm358F4BSB3Pv4/Fhlf2Uoz5445ZPZ8HYemMnS1SxkXofA1RVDDQqhEtI5UvGbp/ 80T4mbp3qFe6oKQ1n/BkNVvEIB1LbAAdAalmchXe7TU4JfpFDRxzzt+C6wDHNLqWsCrj crGyZg2aaTNQH7zM6E/XnG8B5Kl1NkmaARjE2pdNmiRwCLbItRHCuQvIUOBHmXNiB0oj /l3Q== X-Gm-Message-State: APjAAAXrMVxE1IF6OqSrIpdp0KCy0dJMETRBS2ffHV4UBownC1LvhvUj t+5Rrv/9LCtyXVuQDbQRmAs/iZAGxRU= X-Google-Smtp-Source: APXvYqx3ORoLXL/584JzAswlKXK9w5S/0tkm3FllH/aC0LQ1Pv7VWkSl6W4Rr5NB/r95ml8ebuOy8g== X-Received: by 2002:a05:600c:2056:: with SMTP id p22mr18566257wmg.155.1565475620818; Sat, 10 Aug 2019 15:20:20 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:5c0b:c2fa:5389:82dd]) by smtp.gmail.com with ESMTPSA id q20sm40403233wrc.79.2019.08.10.15.20.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Aug 2019 15:20:20 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Aug 2019 01:19:32 +0300 Message-Id: <20190810221934.44996-12-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190810221934.44996-1-velocityra@gmail.com> References: <20190810221934.44996-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v13 12/14] lavc/mjpegdec: Skip unknown APPx marker on bayer images X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Nick Renieris Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Nick Renieris Samples: - Embedded JPEG images in the DNG images here: https://www.photographyblog.com/previews/pentax_k1_photos Signed-off-by: Nick Renieris --- libavcodec/mjpegdec.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 0a920a7144..1f2fabe2df 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1807,8 +1807,15 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) int len, id, i; len = get_bits(&s->gb, 16); - if (len < 6) - return AVERROR_INVALIDDATA; + if (len < 6) { + if (s->bayer) { + // Pentax K-1 (digital camera) JPEG images embedded in DNG images contain unknown APP0 markers + av_log(s->avctx, AV_LOG_WARNING, "skipping APPx (len=%"PRId32") for bayer-encoded image\n", len); + skip_bits(&s->gb, len); + return 0; + } else + return AVERROR_INVALIDDATA; + } if (8 * len > get_bits_left(&s->gb)) return AVERROR_INVALIDDATA;