From patchwork Wed Jul 1 18:34:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20765 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 7A221447BD2 for ; Wed, 1 Jul 2020 21:34:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A70A6880D1; Wed, 1 Jul 2020 21:34:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37C8D688047 for ; Wed, 1 Jul 2020 21:34:32 +0300 (EEST) Received: by mail-pj1-f48.google.com with SMTP id gc9so4818638pjb.2 for ; Wed, 01 Jul 2020 11:34:32 -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=epsjtk9yAtN9tFd+wTpc+xXA7OWyweDyMznj1vbSx00=; b=P8ncrUXenZbKGV/iQ87+5cC80hycd7p+5K8isuc6EJrQsC/SVaH8abR3W85oJkjNbh XfmFQ91o77EXi5Zlki9ZW/iTU/+0XSasNJFDoCMWLGOdK7tmQC+F+e4S82sfZu1YaaZ5 4HtPgJkToaIAacWTR9FzDOmn7A/BXYl1WGkeL8PrunoFdeRBcoRn4KslZeqweW3o3wsx B5C7FC96f0pbxhLwykddb6PxBrALb+7iX5cZFir7tSQWtN1kjrEnaJkvwKCb4zObseq3 EnzU9KiGf68BtyxCgNyIBe7cES2huTIYdbH4j1Xp58k0UKL5obGBHtgoXjCkW/6Y4QRK XmWg== 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=epsjtk9yAtN9tFd+wTpc+xXA7OWyweDyMznj1vbSx00=; b=WcQcmmTN35Gr6uJa/D2WcftqNsXLwLF2Fq3wfH0KjW1uI1BFX+iVo9jNqn7yBOPArY CGS0Oiyi58Q38PpMDk+zvRCi1IqzLUSNhNX8b9rO7cAgsF75UXkQHyxX0KJpJXyY6SV7 GBe4Zq4J00to/DU2wI0ia9y4b0KrB4BKq1U9rdN5a88X3yRtaxQ4TVPfGLhlhkK8n7PH eGDfuga2ZQb56h3/vtSH4U4Ts5MHakR/LYC4zRUdBfO8Nomy7UEQ2PMStpogs68FLDPm 4Z24qsdlS26/COIkGrVBFbYzx7xrN39gyZxjoRLvnpQH2o97PKvxEkP/PM+WJvs5H2zN D1GQ== X-Gm-Message-State: AOAM530r5iXZl8ka2PhyfV8b7jK1KV5/m0VzJoICdT4cVnomOr3UiBlz den/5TDCiJl9qKG0PtRlWwDkJOlTJHM= X-Google-Smtp-Source: ABdhPJwnya671Y2PiE86xt9PbEIj+LqeAvIk7wCeAPMbbJiGybAzvElrhYJYj1+Biw/093BBLadkmw== X-Received: by 2002:a17:90a:6343:: with SMTP id v3mr29411065pjs.196.1593628470089; Wed, 01 Jul 2020 11:34:30 -0700 (PDT) Received: from localhost.localdomain ([122.172.138.213]) by smtp.gmail.com with ESMTPSA id v28sm6981720pgn.81.2020.07.01.11.34.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 11:34:29 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jul 2020 00:04:22 +0530 Message-Id: <20200701183423.21335-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] libavcodec/jpeg2000dec: Enhance pix fmt 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 This patch assigns default pix format values when a match does not take place. --- libavcodec/jpeg2000dec.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 3f4a9ef96c..86f9170723 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -436,6 +436,15 @@ static int get_siz(Jpeg2000DecoderContext *s) s->cdef[3] = 3; i = 0; } + } else if (ncomponents == 3 && s->precision == 8) { + s->avctx->pix_fmt = AV_PIX_FMT_RGB24; + i = 0; + } else if (ncomponents == 2 && s->precision == 8) { + s->avctx->pix_fmt = AV_PIX_FMT_YA8; + i = 0; + } else if (ncomponents == 1 && s->precision == 8) { + s->avctx->pix_fmt = AV_PIX_FMT_GRAY8; + i = 0; } } From patchwork Wed Jul 1 18:34:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20766 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 8A20F447BD2 for ; Wed, 1 Jul 2020 21:34:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A25D68A646; Wed, 1 Jul 2020 21:34:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D81A68A964 for ; Wed, 1 Jul 2020 21:34:34 +0300 (EEST) Received: by mail-pg1-f179.google.com with SMTP id g67so11235808pgc.8 for ; Wed, 01 Jul 2020 11:34:33 -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=1ZVYpLvRKIEazU5oOy37Nkd/56JcNckxDHCS2BdhDUk=; b=guqIYBqPuGASbViu/mBjZZMs7fUBpeV+pWer03BaVCd3CVWeGZkidWw/VrMC52ecAP S0t/ZzsBg7bzrs3uI3sQktKNCdCkfkMPNaJTFfwCLdA65/qRpMVKXJakxXBhtpPiRC6N BaETcXsv7Z/nzzd9sI76PtAQoVD+ZCA47E4+AiyrPTaCIUnQTvYYLdx9UheSO3f00H+D 7AcWubAgd878GS8UiF0myixRoDrd0yVrM1BhzYS/dpn1MFTclmduyrgBDslEqP1qY13w suzNk46WSPP30wQUwqt8+kDrp3w093c5IDwNXQUEr9jSbOxnlfzmmVteK0gWATb9UQwQ ifvg== 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=1ZVYpLvRKIEazU5oOy37Nkd/56JcNckxDHCS2BdhDUk=; b=j2ivu8QUZLX0MSRh9l7AQ2TUVQpOm+Q6MtIJWUZ+PYlw6fsgx6KKOPm6kZugCcsg3G d+jRGjd+yg8sA0AC3cpuQC3x7dHC7iKaTomm+T/Gs4r2GUvbBE/A/hS5n05cSB9TWa99 TA1r5OAyxYvbhzIBvYJh4jNkKX9HHxRA3H7uf7NhIxLmkGE8ozk5GwT99aD1RY+4Qvt6 /062qDWw5F9MXvrXEzbPv4Ezm9ImgZoN6SuZhPCQmj3FC3ic2kx/GpmxLpy4Je2Lp+c8 qvQ7hRZbRm0a9VTGTix2WS6YlpNIsWo1dNlMzPy22yCkdEH3CKX7gTBgrBoG0+ogvV1L eNBA== X-Gm-Message-State: AOAM531nOfj9EZC5UxshNX9tOFmoNKHJKm9WfGVVQKZYX6S21VsTq5yR h2DT02oGele+zD6DWiij+vXmchrTZ2s= X-Google-Smtp-Source: ABdhPJxHpIp4fU2nH8n0SO5X+2pRlIQsgTLV95RI+PMhcGhhabnqOnmyaeBdiRBl3kUYQf2UJqhmtw== X-Received: by 2002:a63:7c42:: with SMTP id l2mr19447815pgn.35.1593628471905; Wed, 01 Jul 2020 11:34:31 -0700 (PDT) Received: from localhost.localdomain ([122.172.138.213]) by smtp.gmail.com with ESMTPSA id v28sm6981720pgn.81.2020.07.01.11.34.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 11:34:31 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Jul 2020 00:04:23 +0530 Message-Id: <20200701183423.21335-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200701183423.21335-1-gautamramk@gmail.com> References: <20200701183423.21335-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] 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 86f9170723..f91406ab9e 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;