From patchwork Tue Jul 23 12:44:05 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: 14043 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 F1E71447A87 for ; Tue, 23 Jul 2019 15:44:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D158668A906; Tue, 23 Jul 2019 15:44:36 +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 36F4D68A6C7 for ; Tue, 23 Jul 2019 15:44:30 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id p13so42997462wru.10 for ; Tue, 23 Jul 2019 05:44:30 -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=F1Xn8c1YdBxpHsPMMvzxQ97auAsS61zB+Sn+gOOG03E=; b=q3a9m8x5q5jU2xrShiJ2waRKDl/1rX5jKBVCEVRWTiqRlq72T9y1+pzM644uMggimZ /l9TwjDDyYcIijE+LS3m9TgNRRBVPQ6QjKj9icmeeZHZi73tZSn0ixpEZMb0c/y+O6N/ +t9aGZ9+cjDxhgtPhPpW1Dn1MSXczUxaoHsQCVzsmGLxYf0K0R2/FD9F+JMtFTbihWN0 5qOfxrbFzxyl5qcf5M0+u8gLiNp16Q794SyjEk3J3Rc5nqQYeM0bGQA6lkcUmC+a9cXM 8hz2QXyhuIu7Ekg6dI654zTGs4wZFhWsbCJTc49kTMRU9T8qglfU1V2KUKEFAJxk63Vo vx0w== 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=F1Xn8c1YdBxpHsPMMvzxQ97auAsS61zB+Sn+gOOG03E=; b=qVCKplHaiOABCwaJ76axOMdPnG4gUcPJUNhDClm4QYBgeDg/u9kGgWLc6R6T7iUAgI qM83NK0Ixgcx1sQtHgog8//7SfiNae6lTAX3/tO7eHmcYmbRwgge5kwOPHLOPu6dbmqh PghcIHh0wEetPczm0e27DzaBhcy1MZsqBOJFyPRc8jQcJrxm9wj7G8Jg5W/xzssq6oQr bYYmSMpKCIWLPnXYRcknCWM+rcoJkmUe8eMNaXUmahe+33JU62/+34OiAF8w7djUnl7d WkivmTKsSbci08vFMq+svyS/cb0i6MGCu51H1zQIV2XUTYbamNDNXc3BfYQQHGLu8goH Uzag== X-Gm-Message-State: APjAAAVKEbgSSj7PxWLOc2HBKx5iZOWtog1cyz567NzFYytjtnO1/lPA yHT484wv6ewsl+s+9Cj/gUUfztSw X-Google-Smtp-Source: APXvYqz0j1Jx+XugtZC/XBx1buB33wYw1eRUrx68ysaY5QW3/iplIg5ZIK8HnhPH3Cx2wwk+HifpCg== X-Received: by 2002:a5d:53c1:: with SMTP id a1mr53019131wrw.185.1563885869393; Tue, 23 Jul 2019 05:44:29 -0700 (PDT) Received: from localhost.localdomain (athedsl-290719.home.otenet.gr. [85.73.183.61]) by smtp.gmail.com with ESMTPSA id b2sm55818870wrp.72.2019.07.23.05.44.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jul 2019 05:44:28 -0700 (PDT) From: velocityra@gmail.com X-Google-Original-From: velocityra@gmail To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Jul 2019 15:44:05 +0300 Message-Id: <20190723124406.9560-1-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] lavc/mjpegdec: Decode Huffman-coded lossless JPEGs embedded in DNGs 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 Main image data in DNGs is usually comprised of tiles, each of which is a Huffman-encoded lossless JPEG. Tested for ljpeg regressions with: `ffmpeg -f lavfi -i testsrc=d=1 -vcodec ljpeg test.avi` `ffmpeg test.avi out.avi` The modified code in ljpeg_decode_rgb_scan runs without issues. Signed-off-by: Nick Renieris --- libavcodec/mjpegdec.c | 54 ++++++++++++++++++++++++++++++++++++------- libavcodec/mjpegdec.h | 1 + 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index a65bc8df15..225833d1bd 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -412,6 +412,14 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) return AVERROR_PATCHWELCOME; } + /* Lossless JPEGs encoded in DNGs are commonly bayer-encoded. They contain 2 + interleaved components and the width stored in their SOF3 markers is the + width of each one. We only output a single component, therefore we need + to adjust the output image width. */ + if (s->lossless == 1 && nb_components == 2) { + s->bayer = 1; + width *= 2; + } /* if different size, realloc/alloc picture */ if (width != s->width || height != s->height || bits != s->bits || @@ -488,6 +496,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) } switch (pix_fmt_id) { + case 0x11110000: /* for bayer-encoded huffman lossless JPEGs embedded in DNGs */ + s->avctx->pix_fmt = AV_PIX_FMT_GRAY16LE; + break; case 0x11111100: if (s->rgb) s->avctx->pix_fmt = s->bits <= 9 ? AV_PIX_FMT_BGR24 : AV_PIX_FMT_BGR48; @@ -1041,26 +1052,36 @@ static int handle_rstn(MJpegDecodeContext *s, int nb_components) return reset; } +/* Handles 1 to 4 components */ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int predictor, int point_transform) { int i, mb_x, mb_y; + unsigned width; uint16_t (*buffer)[4]; int left[4], top[4], topleft[4]; const int linesize = s->linesize[0]; const int mask = ((1 << s->bits) - 1) << point_transform; int resync_mb_y = 0; int resync_mb_x = 0; + int vpred[6]; - if (s->nb_components != 3 && s->nb_components != 4) + if (s->nb_components <= 0 || s->nb_components > 4) return AVERROR_INVALIDDATA; + if (s->v_max != 1 || s->h_max != 1 || !s->lossless) return AVERROR_INVALIDDATA; - s->restart_count = s->restart_interval; - av_fast_malloc(&s->ljpeg_buffer, &s->ljpeg_buffer_size, - (unsigned)s->mb_width * 4 * sizeof(s->ljpeg_buffer[0][0])); + if (s->restart_interval == 0) + s->restart_interval = INT_MAX; + + if (s->bayer) + width = s->mb_width / nb_components; /* Interleaved, width stored is the total so need to divide */ + else + width = s->mb_width; + + av_fast_malloc(&s->ljpeg_buffer, &s->ljpeg_buffer_size, width * 4 * sizeof(s->ljpeg_buffer[0][0])); if (!s->ljpeg_buffer) return AVERROR(ENOMEM); @@ -1078,7 +1099,12 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p for (i = 0; i < 4; i++) top[i] = left[i] = topleft[i] = buffer[0][i]; - for (mb_x = 0; mb_x < s->mb_width; mb_x++) { + if (mb_y * s->width % s->restart_interval == 0) { + for (i = 0; i < 6; i++) + vpred[i] = 1 << (s->bits-1); + } + + for (mb_x = 0; mb_x < width; mb_x++) { int modified_predictor = predictor; if (get_bits_left(&s->gb) < 1) { @@ -1102,12 +1128,19 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p topleft[i] = top[i]; top[i] = buffer[mb_x][i]; - PREDICT(pred, topleft[i], top[i], left[i], modified_predictor); - dc = mjpeg_decode_dc(s, s->dc_index[i]); if(dc == 0xFFFFF) return -1; + if (mb_x) { + pred = left[i]; + } else { + vpred[i] += dc; + pred = vpred[i] - dc; + } + + PREDICT(pred, topleft[i], top[i], pred, modified_predictor); + left[i] = buffer[mb_x][i] = mask & (pred + (unsigned)(dc * (1 << point_transform))); } @@ -1151,6 +1184,11 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p ptr[3*mb_x + 0] = buffer[mb_x][1] + ptr[3*mb_x + 1]; ptr[3*mb_x + 2] = buffer[mb_x][2] + ptr[3*mb_x + 1]; } + } else if (s->bayer && nb_components == 2) { + for (mb_x = 0; mb_x < width; mb_x++) { + ((uint16_t*)ptr)[2*mb_x + 0] = buffer[mb_x][0]; + ((uint16_t*)ptr)[2*mb_x + 1] = buffer[mb_x][1]; + } } else { for(i=0; icomp_index[i]; @@ -1695,7 +1733,7 @@ next_field: point_transform, ilv)) < 0) return ret; } else { - if (s->rgb) { + if (s->rgb || s->bayer) { if ((ret = ljpeg_decode_rgb_scan(s, nb_components, predictor, point_transform)) < 0) return ret; } else { diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index 653fe7cae6..9d1666bebd 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -64,6 +64,7 @@ typedef struct MJpegDecodeContext { int lossless; int ls; int progressive; + int bayer; /* true if it's a bayer-encoded JPEG embedded in a DNG */ int rgb; uint8_t upscale_h[4]; uint8_t upscale_v[4];