From patchwork Tue Jul 21 18:07:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 21218 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 03A6E44B8EC for ; Tue, 21 Jul 2020 21:35:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE5D668B674; Tue, 21 Jul 2020 21:34:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f196.google.com (mail-oi1-f196.google.com [209.85.167.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0599C68B66B for ; Tue, 21 Jul 2020 21:34:54 +0300 (EEST) Received: by mail-oi1-f196.google.com with SMTP id l63so18051889oih.13 for ; Tue, 21 Jul 2020 11:34:53 -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=a0+wBOzP+RmN7ztCGc894NxgShL0qQ5tNzMYz8eRPQM=; b=YaUFMu1g5EKWUgeU048ffSbPdGRm6XKAJue3iHRtE7dUzbDEX8GkOS2bZnpvMFZBiW 8KRmN2F1B2RksOkjOwIhetXU5ripsbsBBg/JSoxjD4dpnubUOS6J52JdY26ruPeJ0Vlu Jlj7uCk8+kK40QfBmt5kLJB2aEr1G9t5FOjEfWq4v08WReX9tsuPM8mb8iu3lLt7XKoX BcfbBJgvQqs9/6sAjG9SwfHKTYCK6Gx7ffP4hJ3qizPyx11dGL1t5h27iETQTXTXQwJ6 F9olhKiDzrGZxxlGymxfpODsS0qrrlCUlzPD9qF/N4l6cXRFWCYkFt5clH6o+Wr2OdqW 5gbg== 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=a0+wBOzP+RmN7ztCGc894NxgShL0qQ5tNzMYz8eRPQM=; b=pksGu/zdOYb+YZNuJ/llIHALmX0R9lEzIuSVOQOqjLkIjetnaYhepifNo4WJ1s5BCQ 8Z44DBc47iAr3saY3ia0NX+UGC+DPsLf+HA/UGdO5AksDpKUOSJ2k4CNjilN/MTHEui9 PfgOlDT5sp8TB32fPFk7r/uCF9Y0UtEJgWflqAhlIdnAh73uK3sTp/X8am8i8ombiYx0 jTTwxxJK5zTsWw7gypAnwj/cPXlvVyEuOjTm/xpT1KzrhCmqnXvQ4AWxbX38AAuknqps /1HKZo1Rw8OgiS4ZzAVaLkGO+rapY5LguY93NMlvr9Inzl3smOK8CDeeDZOwzVVUFOqa fKtw== X-Gm-Message-State: AOAM532PcWBK5q4A5lFj0ZuzYfXmqisgYCHEjAbXhOlarokDH5hopTzP ooOxTRMjq7Zg8GTRLlwuS1BDAANQaTiPZQ== X-Google-Smtp-Source: ABdhPJzeP/NYkgAXp3U/rwA4rmNy/n+BL1LpcTB7XKox/e9a8BLDqr3p5DXKXpOPvSrpb5iwUdZ2NQ== X-Received: by 2002:a17:90a:eac7:: with SMTP id ev7mr5584650pjb.21.1595354843162; Tue, 21 Jul 2020 11:07:23 -0700 (PDT) Received: from localhost.localdomain ([122.172.60.196]) by smtp.gmail.com with ESMTPSA id u2sm21543700pfl.21.2020.07.21.11.07.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 11:07:22 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jul 2020 23:37:14 +0530 Message-Id: <20200721180715.19237-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200721180715.19237-1-gautamramk@gmail.com> References: <20200721180715.19237-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 2/3] libavcodec/jpeg2000dec: Add check when done with main header 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 This patch sets a flag when the processing of the main header is complete. --- libavcodec/jpeg2000dec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 5e9e97eb6a..23792c15b2 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -102,6 +102,7 @@ typedef struct Jpeg2000DecoderContext { uint8_t cbps[4]; // bits per sample in particular components uint8_t sgnd[4]; // if a component is signed uint8_t properties[4]; + uint8_t in_tile_headers; int cdx[4], cdy[4]; int precision; int ncomponents; @@ -2165,6 +2166,9 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) ret = get_poc(s, len, poc); break; case JPEG2000_SOT: + if (!s->in_tile_headers) { + s->in_tile_headers = 1; + } if (!(ret = get_sot(s, len))) { av_assert1(s->curtileno >= 0); codsty = s->tile[s->curtileno].codsty;