From patchwork Sun Jun 21 18:42:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20540 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 8E3AB449CB2 for ; Sun, 21 Jun 2020 21:42:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 587C668B7E7; Sun, 21 Jun 2020 21:42:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 19F4068B545 for ; Sun, 21 Jun 2020 21:42:30 +0300 (EEST) Received: by mail-pg1-f180.google.com with SMTP id l63so7070374pge.12 for ; Sun, 21 Jun 2020 11:42: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; bh=8ORo3mPmIardzNFhJ3U0Xgom5v7rFsyxHQhqtzAKULM=; b=OeDPDf7x7dq3Zb/6IakqWibokaH+Iow0Cxe+dyzUniPXUNuMU4NYK+WXQLaSe9t2q3 7VSLuECvDy7Pz9HB79xp8lRJ4ytcOCYZ2i9OncIavVdtgctChbNqjiFPfqHp2PM3PJUj QGeYjvvbqeDXdF6dXZn1rIJlafM3lcx92qcNRXW1X1YxIdYw4huPo9yM3kVyPq6w2YfT XY+Qtn/DkcHDHozeItXXgB1upC5ugMlQHOjajhGAHynhWBktJNhsfa7WXqHWTBO/vY2j pPMtijlgMN1JXz4TuquiaNpdcoiadbDZ2m3EC3sE4WK2a5N1rvmHtld6Et3bE6tlRXNX TqHQ== 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; bh=8ORo3mPmIardzNFhJ3U0Xgom5v7rFsyxHQhqtzAKULM=; b=b/gH2pUwV7GsWv91HsO2vVFnqMxCuQnFnCb27YkgoVTBslR8x2bkWX3kWF3uSEnVKE lACQq31F4u9OSpw5xJKWqa1Lepf280LVn8wEP17j16eeoInI97TkwJ1i2dnDcJywBeN3 JNuRymIjB/QOGZv8jRunwhjobR31P5pHSHdMjO0qBjs2JQathL4UkhrVfKFDvvKf9otK sRtqoSW0N9w1U9pEeek7YYEG0iBaChOnCZr7jTw8riSW3lvmQEPIBYy0bywGCSgVLP5u Oyi+lFdg1bSby/kT+wOlD6Fe4y5DIlAYG5UYB06jr9OLhNl6FDAEbGRnEhOotCA2FCN1 4bcA== X-Gm-Message-State: AOAM530KEdsE90yKgU7m69AuSpzLsWsTbR2DNjAVT93GBiT1vVM+WiJ/ B19xSnKA+kDQE5VmQB6UX6DOJeBDKHw= X-Google-Smtp-Source: ABdhPJzV9MvjXkrWZIeuwqg293WibvjGSi5NNa1CuMIcVwu6TEI+hxAnzLJB9iWdC9FpaGxN+MdPyw== X-Received: by 2002:a62:1c8a:: with SMTP id c132mr17661832pfc.69.1592764947604; Sun, 21 Jun 2020 11:42:27 -0700 (PDT) Received: from localhost.localdomain ([122.167.28.239]) by smtp.gmail.com with ESMTPSA id s1sm10786414pjp.14.2020.06.21.11.42.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jun 2020 11:42:27 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 00:12:04 +0530 Message-Id: <20200621184208.27665-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/5] libavcodec/jpeg2000.c: Precinct size check removed 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: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gautam Ramakrishnan This patch removes a check which throws an error if the log2 precinct width/height is 0. The standard allows the first component to have 0 as the log2 width/height. --- libavcodec/jpeg2000.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 73206d17f3..1aca31ffa4 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -509,9 +509,6 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp, // update precincts size: 2^n value reslevel->log2_prec_width = codsty->log2_prec_widths[reslevelno]; reslevel->log2_prec_height = codsty->log2_prec_heights[reslevelno]; - if (!reslevel->log2_prec_width || !reslevel->log2_prec_height) { - return AVERROR_INVALIDDATA; - } /* Number of bands for each resolution level */ if (reslevelno == 0) From patchwork Sun Jun 21 18:42:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20541 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 46108449CB2 for ; Sun, 21 Jun 2020 21:42:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 30A0B68B82C; Sun, 21 Jun 2020 21:42:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CA2168B822 for ; Sun, 21 Jun 2020 21:42:31 +0300 (EEST) Received: by mail-pl1-f194.google.com with SMTP id 35so6540799ple.0 for ; Sun, 21 Jun 2020 11:42:31 -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; bh=+X134DluktfHssJSQjq8qkQxgx7V6XuCmjLtXj4fFLM=; b=OPYdREu0xsw85SaBX1WRf+XKrGEwHYbjFdro04pB/Y+NIB6FbMNz2I9I8mGS4RuQHm epkgwm3l8xTx5kKoFYZzvX1318rwsmWznpck2xC6hVLSeUIXKyYZelZQaiv0eoEzm9Cn TmdX0GVZdWquDPk4/wpRGyBxqR7EylzlqQS4oBCHfe9wRGYKaZDN6Qe5DIXGJj0kU/88 ADQRY8sGxUNS5KeiM/8ygicL5X420PzHP/S43I+81RwNbGvns8rdNplJltxsnq2FDQPc KP1gztzdfO7L9K4Kz6pRDOtFRf29yDosS+lgHNjFghx/H7pRYId+DjnUcNJqXvgg8fPe oizw== 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; bh=+X134DluktfHssJSQjq8qkQxgx7V6XuCmjLtXj4fFLM=; b=sNRG9rtkajfnGqW2I6iS+mIE8CkLc1iXED14GCOrCIkaEAT+ggImpHIa1fN7TFEEZ7 JdFNOJruRAaabe3TJzvhR6rGWbTkYQQV2gfFBFv2Yw7fMHtglFCyfqaJ96wSKVhl8NKa KRapTPry0j0yMh4m60U2XKAV5aLrFbM8d0fP3iNoDIEpzZouEgBkgMP0ydEEfD0lYyWF xadxtBuNiF+Mbjd33+QUXFh073ZgudsT2Xn1z09ZsNlY3cLRj1+Z169vDaaGRW+NT1Dz ZhU6SV7LQz/Ghz8GUUdvv7SoY3jK47P8c1A72FJv4biJf3YynMSr4L+B3GeH0bukV9KX 0Tng== X-Gm-Message-State: AOAM531X15e6urQuJAiiIZxK5Z4kzpbTsfsVQ7+7kFVyFCuHWpWqEu2B zcZ0SpaHNhiws0DaXJdJ2trd+gAl8Zo= X-Google-Smtp-Source: ABdhPJykGWsBsJth/xsS5yQdSME45IRsT642jxrVqZFg4gqJ8e51s0i3mdj18FJMAmNewt03m8Dn1A== X-Received: by 2002:a17:902:a606:: with SMTP id u6mr10852128plq.94.1592764949505; Sun, 21 Jun 2020 11:42:29 -0700 (PDT) Received: from localhost.localdomain ([122.167.28.239]) by smtp.gmail.com with ESMTPSA id s1sm10786414pjp.14.2020.06.21.11.42.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jun 2020 11:42:29 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 00:12:05 +0530 Message-Id: <20200621184208.27665-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200621184208.27665-1-gautamramk@gmail.com> References: <20200621184208.27665-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/5] libavcodec/jpeg2000dec.c: Modify image dimensions 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: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gautam Ramakrishnan Reduce image size of the image if all components have a non zero sample separation. This is to replicate the output of opj_decompress. --- libavcodec/jpeg2000dec.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index ab36009a2d..05e85f4317 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -269,6 +269,8 @@ static int get_siz(Jpeg2000DecoderContext *s) const enum AVPixelFormat *possible_fmts = NULL; int possible_fmts_nb = 0; int ret; + int o_dimx, o_dimy; //original image dimensions. + int dimx, dimy; if (bytestream2_get_bytes_left(&s->g) < 36) { av_log(s->avctx, AV_LOG_ERROR, "Insufficient space for SIZ\n"); @@ -371,11 +373,18 @@ static int get_siz(Jpeg2000DecoderContext *s) } /* compute image size with reduction factor */ - ret = ff_set_dimensions(s->avctx, - ff_jpeg2000_ceildivpow2(s->width - s->image_offset_x, - s->reduction_factor), - ff_jpeg2000_ceildivpow2(s->height - s->image_offset_y, - s->reduction_factor)); + o_dimx = ff_jpeg2000_ceildivpow2(s->width - s->image_offset_x, + s->reduction_factor); + o_dimy = ff_jpeg2000_ceildivpow2(s->height - s->image_offset_y, + s->reduction_factor); + dimx = ff_jpeg2000_ceildiv(o_dimx, s->cdx[0]); + dimy = ff_jpeg2000_ceildiv(o_dimy, s->cdy[0]); + for (i = 1; i < s->ncomponents; i++) { + dimx = FFMAX(dimx, ff_jpeg2000_ceildiv(o_dimx, s->cdx[i])); + dimy = FFMAX(dimy, ff_jpeg2000_ceildiv(o_dimy, s->cdy[i])); + } + + ret = ff_set_dimensions(s->avctx, dimx, dimy); if (ret < 0) return ret; From patchwork Sun Jun 21 18:42:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20543 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 BE03A44A2DA for ; Sun, 21 Jun 2020 22:04:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A62D68B854; Sun, 21 Jun 2020 22:04:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f66.google.com (mail-qv1-f66.google.com [209.85.219.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7DE668B0A1 for ; Sun, 21 Jun 2020 22:04:12 +0300 (EEST) Received: by mail-qv1-f66.google.com with SMTP id m9so526056qvx.5 for ; Sun, 21 Jun 2020 12:04:12 -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; bh=1o+qULfDh1aGPOSxqgUV0g5jZuBqZ33Y55e3IxK+N/4=; b=vE51UgVY4kKOv97Al8U2PZ3v4TsGdL0rZW5t8PyhPT7g4GLBocvnuDrnWRHOwZfwVT uVo8xw34ceI1XpMuHJJKh+COL6csVqIm2h4NFMN4JCkKcELn6XaOqyCZgbGSbHejaEmY Et96UZU2jyWCv2YwUZQAjEVhaKeVjvkzcTPmUPZoc7wsJslShe2HKHXC8EhEflkuSXyO W9uDLWsTLqsDrNNfCl+9D+wdh53dUUSaTVNgmp5uk4zFaFcv7xP+WjLwS7vVHKXM6EK6 rmIiC5awrRRCmyT1MFUsvSYynLe2plqKrJGzR6HpvHE6vVhMlLLRWvrbCu8DQGIayGc1 kXUw== 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; bh=1o+qULfDh1aGPOSxqgUV0g5jZuBqZ33Y55e3IxK+N/4=; b=Hc+I4QYTgvlBliZZtFn+I4hUxYT4m7a1StwzvRl2hP/PaumiJjDcKoqFQgaS8q6lwV IwxymXXhA1aLximYHWuu/dsSTQzhojkKUb6gJN+hI0gA7JcCVcY4bHAf4go2k0kvXhSo bog+mXbpoQb71qKIsP2AvQ0C7q22wBfXYeGTPHaLuFdoLBhgRtj2QZxOdAUdsJ6qRDA9 RSXjieagBVIhMRQj8IYBNhAZVFkrV9k+PL8VoMtS+FCmp662ud+741uOR+lrKY7B/C9q qa2GcBMP3JiKm0mL02Y/sTlrbpICdd4ZoacBdpAwitAqlwNpBYv+KWueM5EicPVxcVAu Q8RQ== X-Gm-Message-State: AOAM5309mJeZuhyXNXMB2R+UkeWuuxAr6Kuw0dGQNfP4+HRyeUyOLy+E eClhV/jKUBxPy5IV+NzjitiZtrGkr7U= X-Google-Smtp-Source: ABdhPJz1aUSF7NX5Enp76U/4VAhjFPuCBYSJG2sCxL8DUuB4joo5wOdJDd8Yt29qc+lCWn7nmdq1WQ== X-Received: by 2002:a62:ee08:: with SMTP id e8mr15891914pfi.93.1592764951270; Sun, 21 Jun 2020 11:42:31 -0700 (PDT) Received: from localhost.localdomain ([122.167.28.239]) by smtp.gmail.com with ESMTPSA id s1sm10786414pjp.14.2020.06.21.11.42.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jun 2020 11:42:30 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 00:12:06 +0530 Message-Id: <20200621184208.27665-3-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200621184208.27665-1-gautamramk@gmail.com> References: <20200621184208.27665-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] libavcodec/jpeg2000dec.c Fixed WRITE_FRAME and tile co-ordinates: 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: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gautam Ramakrishnan libopenjpeg2000 uses ceiling division while dividing tile co-ordinates with the sample separation. Also, corrections were made to the WRITE_FRAME macro. --- libavcodec/jpeg2000dec.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 05e85f4317..546a646668 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -978,12 +978,11 @@ static int init_tile(Jpeg2000DecoderContext *s, int tileno) comp->coord_o[0][1] = tile->coord[0][1]; comp->coord_o[1][0] = tile->coord[1][0]; comp->coord_o[1][1] = tile->coord[1][1]; - if (compno) { - comp->coord_o[0][0] /= s->cdx[compno]; - comp->coord_o[0][1] /= s->cdx[compno]; - comp->coord_o[1][0] /= s->cdy[compno]; - comp->coord_o[1][1] /= s->cdy[compno]; - } + + comp->coord_o[0][0] = ff_jpeg2000_ceildiv(comp->coord_o[0][0], s->cdx[compno]); + comp->coord_o[0][1] = ff_jpeg2000_ceildiv(comp->coord_o[0][1], s->cdx[compno]); + comp->coord_o[1][0] = ff_jpeg2000_ceildiv(comp->coord_o[1][0], s->cdy[compno]); + comp->coord_o[1][1] = ff_jpeg2000_ceildiv(comp->coord_o[1][1], s->cdy[compno]); comp->coord[0][0] = ff_jpeg2000_ceildivpow2(comp->coord_o[0][0], s->reduction_factor); comp->coord[0][1] = ff_jpeg2000_ceildivpow2(comp->coord_o[0][1], s->reduction_factor); @@ -1936,18 +1935,23 @@ static inline void tile_codeblocks(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile float *datap = comp->f_data; \ int32_t *i_datap = comp->i_data; \ int cbps = s->cbps[compno]; \ - int w = tile->comp[compno].coord[0][1] - s->image_offset_x; \ + int w = tile->comp[compno].coord[0][1] - \ + ff_jpeg2000_ceildiv(s->image_offset_x, s->cdx[compno]); \ + int h = tile->comp[compno].coord[1][1] - \ + ff_jpeg2000_ceildiv(s->image_offset_y, s->cdy[compno]); \ int plane = 0; \ \ if (planar) \ plane = s->cdef[compno] ? s->cdef[compno]-1 : (s->ncomponents-1); \ \ - y = tile->comp[compno].coord[1][0] - s->image_offset_y / s->cdy[compno]; \ + y = tile->comp[compno].coord[1][0] - \ + ff_jpeg2000_ceildiv(s->image_offset_y, s->cdy[compno]); \ line = (PIXEL *)picture->data[plane] + y * (picture->linesize[plane] / sizeof(PIXEL));\ - for (; y < tile->comp[compno].coord[1][1] - s->image_offset_y; y++) { \ + for (; y < h; y++) { \ PIXEL *dst; \ \ - x = tile->comp[compno].coord[0][0] - s->image_offset_x / s->cdx[compno]; \ + x = tile->comp[compno].coord[0][0] - \ + ff_jpeg2000_ceildiv(s->image_offset_x, s->cdx[compno]); \ dst = line + x * pixelsize + compno*!planar; \ \ if (codsty->transform == FF_DWT97) { \ From patchwork Sun Jun 21 18:42:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20542 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 28ED6449CB2 for ; Sun, 21 Jun 2020 21:42:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 10AA168B822; Sun, 21 Jun 2020 21:42:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1A5568B7B7 for ; Sun, 21 Jun 2020 21:42:34 +0300 (EEST) Received: by mail-pf1-f170.google.com with SMTP id d66so7289247pfd.6 for ; Sun, 21 Jun 2020 11:42:34 -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; bh=RNHIMj+7Z1U/jnfzMYLReNoHTNnaeF/5gA1K1aqUJCM=; b=AqMNYthlV44fT5An+o3KRT4bXzVA6zEiogy58ObaDbaKfuojxPhZV7BBuuHsOL1U+f GAkqIqXlEg+uFlivIOGF2kAoYifxGtLRAK0NgfxcZH83uyltwWqWiiRajYejzI/m/P0Y Q/yrOtDkJ72Z//DCiopl0ezAv8In0Ra9zMEW5ELwVJOMmFgsq2aiAET9hM4FVwC577SR ATngHm4jYjIVQdN53yTRQpgq7R2r1P7f9LV1skryLwtQ9OE9EcktP74WP88yT7XNcAU5 YD4I+b08miG2K8bPP4S7BZXaHws30zSkrvCULwyYTBDsFPrtCgL405LsUdvVfNWddoDZ P+lA== 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; bh=RNHIMj+7Z1U/jnfzMYLReNoHTNnaeF/5gA1K1aqUJCM=; b=ImemlSpnfg+GHyHsrXGYObyl3nn85tCtzYE9Wyr9mGSZavayQZQCHpqADzGIgmd9tD rzdmBoglWmalgeH2PT++1NSQDEu8mkVgPF2oYHLa3UEgmQhq1MTSwr9CNUvp0C0A9stO TEkegHAZo9uvf9zRg83p/mcaIj7R1+9Sjolx5CD2/R+XcBtBppMCv3NXueuuJ73kH1Oq zGa9TdimP1Vg02HyMJR/quCtmzd8ISHZSW2sj9kIP/p3zyKFVuJvYNP0DfgMwkH3RcZ+ OtZ6aH1bAFmo0kj+qAOufV6e/AQY/+LSQurnCI83cKblwVPMHwC2uRoK6FhY10P0RO/r KmyQ== X-Gm-Message-State: AOAM532u73/dwalzBVgNNnY/qJwcMK6TQ4+ld3GRg6ilOBtlauKy9pzl 1u6g66rODJvlgKy9DHZT+X7q0dLQJ5M= X-Google-Smtp-Source: ABdhPJx2tzNB4erTpNATN+bXhoE5gHPma0NBc0lttnc/6tEaVV9iEGh0s+o0KBWKvccq573zAX/FDA== X-Received: by 2002:a63:ff51:: with SMTP id s17mr8860044pgk.300.1592764952984; Sun, 21 Jun 2020 11:42:32 -0700 (PDT) Received: from localhost.localdomain ([122.167.28.239]) by smtp.gmail.com with ESMTPSA id s1sm10786414pjp.14.2020.06.21.11.42.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jun 2020 11:42:32 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 00:12:07 +0530 Message-Id: <20200621184208.27665-4-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200621184208.27665-1-gautamramk@gmail.com> References: <20200621184208.27665-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] libavcodec/jpeg2000dec.c: Enable image offsets 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: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gautam Ramakrishnan This patch enables support for image offsets. --- libavcodec/jpeg2000dec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 546a646668..c8c89803ac 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -288,10 +288,6 @@ static int get_siz(Jpeg2000DecoderContext *s) s->tile_offset_y = bytestream2_get_be32u(&s->g); // YT0Siz ncomponents = bytestream2_get_be16u(&s->g); // CSiz - if (s->image_offset_x || s->image_offset_y) { - avpriv_request_sample(s->avctx, "Support for image offsets"); - return AVERROR_PATCHWELCOME; - } if (av_image_check_size2(s->width, s->height, s->avctx->max_pixels, AV_PIX_FMT_NONE, 0, s->avctx)) { avpriv_request_sample(s->avctx, "Large Dimensions"); return AVERROR_PATCHWELCOME; From patchwork Sun Jun 21 18:42:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20544 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 6A7FF44AB81 for ; Sun, 21 Jun 2020 22:11:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 470A068B852; Sun, 21 Jun 2020 22:11:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BF316898D5 for ; Sun, 21 Jun 2020 22:11:40 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id z63so7317877pfb.1 for ; Sun, 21 Jun 2020 12:11:40 -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; bh=AJVZpS8x2d7pGe65QnDyV4agCs9hQtK/TlgfEonUG9U=; b=rYDS3xtbgLz1DKzd0FoXG8qwUzZwYSmDZQRZ4yXq+HHNfTHUgx2OWnuY9Gu/QGPBUU uTYvy9HOxYX8eSMBkRfhO7RGLCdkm2pg6HRwt3hvC6CRznWRdYC4LkZsvKeXaEnUSYAU bT9cu0pM/peAPzindIRd1R4DRtxJA6fgeoX1rQMr9rLN+ntXaeWKphwA4gXRqmXJh31T Du33UuYXdospWAdocp0kCdrrDRhLFAwnwgaDzAmIIzVt1PqF49HoSM0XwtriRyAzUfHr aUipm++Bml9aURnOGTwp+LceS/6pYzRmZ4fjIZTcbpLzdgJFnlQL+Ml9mnttJr/ePvUz Z5BA== 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; bh=AJVZpS8x2d7pGe65QnDyV4agCs9hQtK/TlgfEonUG9U=; b=X+mu+g4v2eaZnXVzXI0xekeL8G/UsXeBjtgTlBIANqpEkKfBjmWcEesaEAlRugz8fy ztsVhhLvtmyReGhPPiq0WlH1bm2Wcv467WMxAQXdu8kpCu8GlID1lR1r6I0IBX5nspSP xL/CQkxN6yug2jcfeA/OtZpHwvpVZdzwmmUQJjhhJCTHWIdRojUPnvlX9jYobFKx1bYM Ugpak/Ixm4Jx679IcXIf2j/IO9heickAgEZXYmnE5iGCzXjK206bgXUxuAo/5I9DsKH3 WOb+/hzbcDolr4ns0u1WqzcDO03NWb/i+vyb8tnQsDWL3aLjOcEvLv69DKmJ1d4yc8sq Lc3g== X-Gm-Message-State: AOAM533Pev1scokZEWXXXZ+SMys3hZDQbhGHOQaYxtpYRWP7GvMd+mQa xhvSyB4Cy8i1NqNoz38FhLN+Zuv8oZg= X-Google-Smtp-Source: ABdhPJxWceieJqfKzmbPiK3j67YdFue6U27bsXU3aT0A3c2F7z04sTMhS8yQIYjKgRHK+zdXPWNo6A== X-Received: by 2002:a63:d317:: with SMTP id b23mr10160490pgg.132.1592764954653; Sun, 21 Jun 2020 11:42:34 -0700 (PDT) Received: from localhost.localdomain ([122.167.28.239]) by smtp.gmail.com with ESMTPSA id s1sm10786414pjp.14.2020.06.21.11.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jun 2020 11:42:34 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 00:12:08 +0530 Message-Id: <20200621184208.27665-5-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200621184208.27665-1-gautamramk@gmail.com> References: <20200621184208.27665-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/5] libavcodec/jpeg2000dec.c: Remove log2_chroma check in pixel format selection 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: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gautam Ramakrishnan The log2_chroma_wh is derived from the sample separations of the codestream if the file is a j2k codestream. Not sure if sample separation is same is subsampling and whether using sample separation values from the codestream to determine pixel format. --- libavcodec/jpeg2000dec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index c8c89803ac..2b9659bf96 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -225,8 +225,6 @@ static int pix_fmt_match(enum AVPixelFormat pix_fmt, int components, case 1: match = match && desc->comp[0].depth >= bpc && - (log2_chroma_wh >> 2 & 3) == 0 && - (log2_chroma_wh & 3) == 0 && (desc->flags & AV_PIX_FMT_FLAG_PAL) == pal8 * AV_PIX_FMT_FLAG_PAL; } return match;