From patchwork Thu Aug 8 20:52:31 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: 14330 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 049F944A056 for ; Thu, 8 Aug 2019 23:55:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4B7568ABC6; Thu, 8 Aug 2019 23:55:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CD9D68ABA8 for ; Thu, 8 Aug 2019 23:55:38 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id r1so96182025wrl.7 for ; Thu, 08 Aug 2019 13:55:38 -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=pLULms0WCN4pTT4G6ln3K8drGb/jylICE/VtRpOWro0=; b=W02Q7FCZDUbZaL/yzEkW9Pm6hIPhCBUFlFPq/hyTXwZQzSCd8bC3VMxexMqPg1CUYe VXoHGdloFq78mBPivfJbCG4pZZS8HU6rgpixHdZq+/I/a2U+QMuCY0ZwqIhdVb4RR1SO KO1ElrXvDkwhD7p4Zoyy2vm8IX1HyORmMIQ/G4PzEbgMpzH1+G9zIuZe6UEq6CzL/IkU saS6GW1SC+1WshwttjVwACGWdNKNpb3xUKgB25/xv+M0YjMhzobrj8JtEPSD+XYv3xVa dlMAVQ0VRJUdcofjzqmWai2RsLmnFunlP+c5r/KPgX52gesrTGLn21lQZThcxBh+D+0n uEzA== 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=pLULms0WCN4pTT4G6ln3K8drGb/jylICE/VtRpOWro0=; b=JeMgP+lmYraVh3QHqUvf3zm5YMcLDSLtw6bEJesa10If6dANQmv4q12U9k8R5p1KpK y7ph/7AX8lSbv/oPO4khF4mJg6LcLF3kMl0PWNkD6v1by3ykun4mis+IBkN0qalekBmd BhSsDdxhWHClDwaW1CgONGaQr/ZTTtIUl1WdOZ615QqdTO6h88+3a3s5e7xSQ7BsD58d vjGAD9A644wvf7fDddJYHFZQMGYfsflZUGpWi5VJyvhBkNPijoxayVuDKbKHsswCmNut UzC6y9cNwB9G9IXmNCjwBEwCYX37PRdyCNEW0YnNfyI8mnjegqxvj3cew2cP0DZAQYzO f/RA== X-Gm-Message-State: APjAAAUO6zHUcIIUuvQqiF8qP2Ly9id++dFvqIZNHm6D9zgQsrjZrN65 DPCHIzn/lL6BDUdVc6L39k17Bt6z2S8= X-Google-Smtp-Source: APXvYqxPrgbCPFXkaLsQ5FR4DqdVe4vBCIhgZfCOvk2jHS6y1gYbZihi/jGFSsnXT7P8hiZDX0wvJQ== X-Received: by 2002:adf:ce8d:: with SMTP id r13mr19495419wrn.37.1565297737755; Thu, 08 Aug 2019 13:55:37 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:1de8:6b2e:8289:ee0e]) by smtp.gmail.com with ESMTPSA id g25sm3446686wmk.18.2019.08.08.13.55.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 13:55:37 -0700 (PDT) From: velocityra@gmail.com X-Google-Original-From: velocityra@gmail To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Aug 2019 23:52:31 +0300 Message-Id: <20190808205233.16368-12-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190808205233.16368-1-velocityra@gmail.com> References: <20190808205233.16368-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v11 12/14] lavc/mjpegdec: Skip useless 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 94cf73549d..b3d6279853 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -1810,8 +1810,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 useless 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;