From patchwork Wed Aug 7 15:27:22 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: 14298 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 60C1E4486BD for ; Wed, 7 Aug 2019 18:45:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4DBCF68AB70; Wed, 7 Aug 2019 18:45:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8043A68AB51 for ; Wed, 7 Aug 2019 18:45:29 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id g17so91852325wrr.5 for ; Wed, 07 Aug 2019 08:45:29 -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=g2/nl5IAT5z7cb0Cpr50/EiyYc+O10HShOuWNVbLe1Ie3ocKpeFu3QV4jcKGQ7tVkf Glb/9dlF6qzUcnl5zXQAHR9pW1eHPs9bAQxRiKUdVeiwvkcaU2Tq1HYaduNwegTmgxZh V6DHSvAhkpIvoo29WVmEas1C4v1bYKKhI5HVpCp4vNygzCfyg8pZw0B1UUrf6G9j+XfV C7nxUjiAfwiMW9KGR2PZk4x51rVrcCmDU5x3Qviztj5t22vTu3q+THJYzUFqoA9xS5fA VzQp7ZyHLBaxNW23YbgLrYOZcY0vwH2SBGbffpnfzkI/1GFfgAFr+iT+Y9at8ahmeUiW XNEg== 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=eUq4gR7Osc3l8WzuZbPyoOm4ceITroBnN8FC0r6RNnWT3OtABsWqvMKrABJyfIYrN8 seW0wuBW8B5bn1//lszvYR3nsBCdSs6Ziv0rvKBEqgGyO3OcbrBIZRfUG84hF22qWBLH OE5a0uRkRlj/O215dL5tui66Q6pJKFV3trCmGiZx1rIeGp1MXyI3sle01I2Pthhoobdf wlQrlBqU5XEnN3T9X2ZrOD/AHNlt0D5S3sLWRiUaeg8UwQHGjJh6qSJEDjoM1MWMWiW9 jKKbnAER2F1B661mKJJmu8Ku+qmzxrXifCZLtE9fab+v7sy2/clmzDJIDa3QIKkxZjV0 DLnw== X-Gm-Message-State: APjAAAUBedz7z1kdZDWq202i22J65e77g8WRUO6C9Orz019auKjFeZ2O IY8vH6nq52xns5vi7e1QukYpBhLr X-Google-Smtp-Source: APXvYqy88wh2FGpSbvHFc/sD888EiuIEBcXIRLB2V63AuvgxpFPYY9q7FmXXgl85PPCJZX1ry5gjWw== X-Received: by 2002:adf:df8b:: with SMTP id z11mr11332356wrl.62.1565192319286; Wed, 07 Aug 2019 08:38:39 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:2409:5200:b577:c48f:5aea:bab0]) by smtp.gmail.com with ESMTPSA id 4sm212050375wro.78.2019.08.07.08.38.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Aug 2019 08:38:38 -0700 (PDT) From: velocityra@gmail.com X-Google-Original-From: velocityra@gmail To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Aug 2019 18:27:22 +0300 Message-Id: <20190807152723.18892-12-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190807152723.18892-1-velocityra@gmail.com> References: <20190807152723.18892-1-velocityra@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 12/13] 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;