From patchwork Sat Jul 18 13:16:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21169 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 C3831446AC1 for ; Sat, 18 Jul 2020 16:16:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A905E68B75D; Sat, 18 Jul 2020 16:16:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CBA9D68AF66 for ; Sat, 18 Jul 2020 16:16:34 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id q17so6756876pfu.8 for ; Sat, 18 Jul 2020 06:16: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=WTXNghfheufiiXQoYSjjJLLd9NVB9xvMpYFIbpLSNoQ=; b=SmY0nC0V9O7ne3DhnzZza6betxOufDMtlYsJ5DonfRo/FjJo6BhGGJ4zyi3O8nBdaM EHSTT5kMpXYlZA79ON8zXaTtcNFMBN9K6zSOderz9pQYsDwXDVggRg6CO0W5APLsbisU WNR8uL3FhE/rwV96HJ/RvKS4ZhETO8NVIqug7dVRC7UdI4SDxx0csCvlLZXpsCFY4Clg MomZ6cMTr4b28Q9yRiRDAD0W79wCgw6GvTWar0cL++EQHooI002+P3AoHXhrNUqBWpLc G6mcLqLACOr9YH9l1+eik/XMiBT+spsHRGpUZvps0fHtk9/z8FhAGNpr9rLfXmLjk84U lT8Q== 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=WTXNghfheufiiXQoYSjjJLLd9NVB9xvMpYFIbpLSNoQ=; b=CzR6gfkbDLtYjYFHOzE0wYZWt4aEqzoMdUVp54rRSY5/oEusQES3OJBQIXCuv6SYBE vnAZO6hLsup4UpqeQUHqgBr/eL8ZQvTFCbxI3oQoMJWbcytTtISxHWqwiJnE3rWGugeF SWDNqcZ3Ko8u3KuVimJEexF8v4/GE44MuZ/ADXdRm7VxwOefqlOUdrtUTWg2l5YzG6Te PwcPk+DaXnpntXhdJFq5W1VTQDaMX2p+CQee4OBwWbpOu5FdyzrKKbWQtQ+DHlWbi6zt DB/k/dH2blQ4qF5iL7s0Na66qlibxeCOq2CYRQUL5qObuNoOHfJIx65MOe0lCu1sCOK1 dH7g== X-Gm-Message-State: AOAM531AcjMX1BUnQDaEt5oktIP6iBrnQJfW0bOpATYO3gf9rt8LFnXa FqxER/2yQFHH1Hn8RWeA2xdVi98fAc4= X-Google-Smtp-Source: ABdhPJzxZlTmC7wNwxupQrkLzfpmbge2GH5QmXVJKAlhEFqK6yIRLjoC3qHuAsMEjoLzaq32ZkzZfQ== X-Received: by 2002:a62:c584:: with SMTP id j126mr11899822pfg.213.1595078192526; Sat, 18 Jul 2020 06:16:32 -0700 (PDT) Received: from localhost.localdomain ([122.172.60.196]) by smtp.gmail.com with ESMTPSA id z10sm10913495pfr.90.2020.07.18.06.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jul 2020 06:16:31 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Jul 2020 18:46:21 +0530 Message-Id: <20200718131622.6234-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200718131622.6234-1-gautamramk@gmail.com> References: <20200718131622.6234-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/3] libavcodec/jpeg2000dec: Support for Parameterless Markers 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 JPEG2000 standard reserves marker values 0xFF30 to 0xFF3F to be used as parameterless markers. This patch adds support to decode codestream with such markers. This allows decoding of p0_02.j2k. --- libavcodec/jpeg2000dec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 5043125fe3..5e9e97eb6a 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2092,7 +2092,8 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) marker = bytestream2_get_be16u(&s->g); oldpos = bytestream2_tell(&s->g); - + if (marker >= 0xFF30 && marker <= 0xFF3F) + continue; if (marker == JPEG2000_SOD) { Jpeg2000Tile *tile; Jpeg2000TilePart *tp;