From patchwork Sat Jul 4 19:03: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: 20806 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 74C7A44A529 for ; Sat, 4 Jul 2020 22:03:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 53D186899C9; Sat, 4 Jul 2020 22:03:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1620B689EEC for ; Sat, 4 Jul 2020 22:03:18 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id u5so15276707pfn.7 for ; Sat, 04 Jul 2020 12:03:17 -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=k0NuFpgFKBPyrDQlYLaxukcSOQaVPm2oxl8DlFDdhBQ=; b=DowCdhfUz7Tfg+7st8uLTl9yu6ZkiWHEhF8sLTV71G88FCu24yJpJ3aXN6ijJgjr+1 vBKVCQ9euOHj6HkS3N20+B5wEwbdcM/FIy02Lj5p9r+ybxlZHns9HpkYpEU8KkhPpGAP VDkBaomIExEhjurl8wJvLacLc7a1PKWqlT36iUznytLHkaIDmTmLheYi1ww3K6XbaJkU pljy8ETngNgs429YiB8fze97AUgy4fDRSfNLAR9bpjbbXN1WBkcPZGchxyFDu+KyGuCE f5QLe1tk5uwPzty1evcgEX4gJ3WyNVlAWulOo5dLaUKIEjA7qejhSrhH/nQ1gp5phqkb 0v5A== 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=k0NuFpgFKBPyrDQlYLaxukcSOQaVPm2oxl8DlFDdhBQ=; b=fvkrdQd6WJk4Ceu+h6Mxo/g0u1+9w4nHM1hNmZGCTyWrie7hMQHbu05NMA8/vCa0uD lgpItw/3BSuJ+I3UZEEt6hxNmJhKkY28gMYCUMEhRltCRR0YmLcVAVYn61MbJ6+D3D4a trxQ8tsweRnpTMWfB6OYAsQletBCALOmtcY3CldsRJqne7sVDYXCd1HcafGFnHckHgB7 P6SQO1wcjjhgQ1XKqBKDMKX75V60Nmk6mRQ5zbe16MQMbWESIvPdkvyEPDtMVKWBmOHj njLFWwHtk/SDgfpbiZv93mOMl9ZcpmjkZNc/w/p8R7UxELd1BQob8Y2Ik8cwKJukMZGM PHcg== X-Gm-Message-State: AOAM530gS0q8GYDFGNgHQ/b9H3SU0eGq1LxLyCbsNmh75NA4VouRRJ3u uKL/IGETipIL/empw1VSzMyO4ppum2k= X-Google-Smtp-Source: ABdhPJzztY3irrziLH3crGsiYoUzaSkKLqsRfju/hmPHeK/GKhwc/6lqxBaAQUZ73uY6Eryii7QZ7w== X-Received: by 2002:aa7:818e:: with SMTP id g14mr33134682pfi.27.1593889395951; Sat, 04 Jul 2020 12:03:15 -0700 (PDT) Received: from localhost.localdomain ([223.226.72.227]) by smtp.gmail.com with ESMTPSA id 186sm8840207pfe.1.2020.07.04.12.03.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2020 12:03:15 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jul 2020 00:33:08 +0530 Message-Id: <20200704190309.29214-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 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 3f4a9ef96c..f62553c874 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -436,6 +436,18 @@ static int get_siz(Jpeg2000DecoderContext *s) s->cdef[3] = 3; i = 0; } + } else if (ncomponents == 3 && s->precision == 8 && + s->cdx[0] == s->cdx[1] && s->cdx[0] == s->cdx[2] && + s->cdy[0] == s->cdy[1] && s->cdy[0] == s->cdy[2]) { + s->avctx->pix_fmt = AV_PIX_FMT_RGB24; + i = 0; + } else if (ncomponents == 2 && s->precision == 8 && + s->cdx[0] == s->cdx[1] && s->cdy[0] == s->cdy[1]) { + 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 Sat Jul 4 19:03:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20807 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 96C4B44A529 for ; Sat, 4 Jul 2020 22:03:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7AC7668B453; Sat, 4 Jul 2020 22:03:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCBFE6891E2 for ; Sat, 4 Jul 2020 22:03:19 +0300 (EEST) Received: by mail-pl1-f170.google.com with SMTP id 72so3207894ple.0 for ; Sat, 04 Jul 2020 12:03:19 -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=N7GJ8Woupj7BeTngP3PRlCzDuvQgQXKD/uxg8Umrm4g=; b=WC1ip1gESMq+IcuXWyPHufw/nf+iXvbJAdlS+DUQ0XUXGWxOHv12Yp4NvVJJT0tKew hr9uONOytTJ5CVMmWqT7Q9hhbHqTr8gts+lc/CVcNRYgofz4f5+BZExHa67RIgGNTIKB ejLEiIT1Zsr6m+J+NWx6fkoogbotmWjUYWFOlK/hVA7aHqTICjsbE49f9pcDpqVcCQZ1 F6ddR/x2DD5fWDfewE5TP37bzwGdEGlUsUD8eP0yD0VWyv6pwjkFa0LbUHMV4We9X57+ XWwWn5P5iEvkcD2N+6mxPBJDJRCSr4FruFtbCbAWpP56mGu3HAlHj7baHT2xpnSSOIjh 3CYA== 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=N7GJ8Woupj7BeTngP3PRlCzDuvQgQXKD/uxg8Umrm4g=; b=avvkbtOzKiE8Ll4CVFBDw4f3lSY9ZUpQx9YzQq8FB8jxTYjDt/pM19Jlc+q+N1Xdqy c6C9xVnbdBJz3Zazpj+N5F5nr3j6upiq7sO24HXI2Sevja/dqbLwz9Um3LFAwxfuzWoi zwIKaw9rRRDRSnUIeLrJzVIpQjDiReMQFP0901SVkHVGiksStznF/UxEQw0V+Mesknnt XqJ8H1rvMwZ+UpnWpa5t0Cpf0esjz7+NZ3HlUApiAkJEKkXoBOuUXxjzQ5/9IcEiJJ5T lFYPfT2AHnX+fmP43IVmtN/X7InbP6m2C5bhvA9G7uW4bjDHsDtLzrrg+TfeoJygwGTx 5NYQ== X-Gm-Message-State: AOAM530PpUG1hLnF+5+W8oGSrKVk51hoH4PqoTfu1jYoV5l4vLTkVpq9 x3S2zEQUG5SyCWYPePXGyGYe1szpSx0= X-Google-Smtp-Source: ABdhPJwVex4MU1EtD1VrAfZbMZujnfZtZqPOWDgWfqVqw23ANrs9IuAqdWBDQxD9/CXGGosqZE8Ofw== X-Received: by 2002:a17:90a:2048:: with SMTP id n66mr22811066pjc.71.1593889397739; Sat, 04 Jul 2020 12:03:17 -0700 (PDT) Received: from localhost.localdomain ([223.226.72.227]) by smtp.gmail.com with ESMTPSA id 186sm8840207pfe.1.2020.07.04.12.03.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2020 12:03:17 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 5 Jul 2020 00:33:09 +0530 Message-Id: <20200704190309.29214-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200704190309.29214-1-gautamramk@gmail.com> References: <20200704190309.29214-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 f62553c874..18a933077e 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;