From patchwork Fri Aug 9 16:29:57 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: 14359 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 52BBA44A01D for ; Fri, 9 Aug 2019 19:31:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3CDBF68ABBA; Fri, 9 Aug 2019 19:31:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E1F268AB8A for ; Fri, 9 Aug 2019 19:31:39 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id r3so5060881wrt.3 for ; Fri, 09 Aug 2019 09:31:39 -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=QclqnUqWI6qKHQRenY++Oiy+TzgEmgHBiL1nIQAg0ec=; b=Ey1HdfeQRAj+AiifBp4zoGHMm1mSYRJvezJq5s8106zJsXFunhxnlYpVh1vVe2c0nF MP5VnbAshJlZq2W1rFiBt54D3yuFTkbzxy7oymYdwQR/+O+WQPWN8mIljAqX2TuTRXhC DMTzERzw/Y8AMEitcXXhKGTrlnTthqwV2Zxwbegxa79wxIFkV9DbBVvngpKeBprC+m2O 3kJRdnNgOOliC0CjXqlDaTud8Yas4PHkxzybNAHZSI97EH6JgPwB/8M3tQUB+UiXrQZ6 3cDWIbNp9e3Xk1VWyuRFoWZXLyn1W4CMiIwceYAfhMpfl6FDp36P+Q+4HMj8REbgbtFJ lLcA== 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=QclqnUqWI6qKHQRenY++Oiy+TzgEmgHBiL1nIQAg0ec=; b=jwnrJ2bEB6OyqrgKPChOyLnQW/WKqcJ3MHZDvgLobW7jiBFfE6Ajj3EIJ3942yLBpd qOAFfTzEmJ0ZlS/DK/iUJZSOLmbvCsHtC3PWI5TOFdilizVl4huBMBlYesyVC9r+c85l g5aDQ3NJAtIa2Lnfxuhr+9xFTnifu4QD1b7rCzkNVe1TDs0aB8s0Q854T/axTqi6az2C qlGXwBh7Q4qyZFi8mV9MQHJdd0DGZJE3CWpB6uInG51tNu1UEdFZ2Fq8UAN8MnMGGgZk +eGC33pmsD+SXaOdN6XbJF5AwlglSqL7FhEYcIbhn9Fe840fJ0bZ73cGJBYl742r9fqy co1A== X-Gm-Message-State: APjAAAW3ANB+NM+RLwlhYXa1RWk2pf/kJfdB8xW2DHTBUwqrVEK3NnZd HBIxoBHHrIxnH2Y3dDkuDgiYXUHZYnY= X-Google-Smtp-Source: APXvYqzyVgH8pMzo7Dx4HuPMdzNXOZU5c1jN9IVQjB6xTiUVBmuw7mhJ6zpP/ItrZQAp1FdzAmVSuw== X-Received: by 2002:adf:e9cb:: with SMTP id l11mr9527805wrn.35.1565368298662; Fri, 09 Aug 2019 09:31:38 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:e9b3:b00d:2017:357c]) by smtp.gmail.com with ESMTPSA id u6sm6721745wml.9.2019.08.09.09.31.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Aug 2019 09:31:38 -0700 (PDT) From: Nick Renieris X-Google-Original-From: Nick Renieris To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Aug 2019 19:29:57 +0300 Message-Id: <20190809162959.17924-12-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190809162959.17924-1-velocityra@gmail.com> References: <20190808205233.16368-14-velocityra@gmail.com> <20190809162959.17924-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v12 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 0a920a7144..e7b273a363 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 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;