From patchwork Sat Mar 28 15:46:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18463 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 99F6A4499F5 for ; Sat, 28 Mar 2020 17:47:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 872C768B4AD; Sat, 28 Mar 2020 17:47:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A2FC68B497 for ; Sat, 28 Mar 2020 17:46:53 +0200 (EET) Received: by mail-pj1-f41.google.com with SMTP id nu11so5104012pjb.1 for ; Sat, 28 Mar 2020 08:46: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=4OMF7jrJbw4gMXvqwmW+QgNlkh3tj6jRWX0jtN9XSpE=; b=KOb8TYrpTnncEM2jIYnsLXzccnZ76yPfk1ZNdncbIOEnywJOp2deS25Ew+3oeS5twp HmYMp4GbEb34mbaXnivR+5bYjronZ4aUOcU/42NinisnNR7fHuTJNclPe+7dRrY/XP0P 1SPMhj1vooPlAz3qDSCUCXft0cY6dbXrXjx7CV3drq1OFE9+JUP5Zsju6Xr8dajvOkS6 4VkKaBKGrhZqX+YN/YYjIWe9dxItpPmbb8FORRMlkTTvfBT2B6lqK9+dyut0Ny97qDN5 S8+JCMhNWsPDl06tAIJxyThSIaY5XQv9tfBQJaAfxujX1Qy1it0t6N5du2ZYA8QiVud8 /LQQ== 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=4OMF7jrJbw4gMXvqwmW+QgNlkh3tj6jRWX0jtN9XSpE=; b=aBCyWOlHG4q/nNDR/a7eJnTDgytA1pTeQNCLKjIfnroCHbyNKfaBF9YkGfaqfuS8mk gqG2huEtxlRjoOavvoa2l+PX8FNrUNehhJCzeZBjkYsc5jM0SUjZ4wD8T6MdG0T85S/H i9BZvGDAZeYtEbwFanGCxmaBCbWvv4wS+0I25V90cIPE4f+gAV8PVd9TP/TWiw5vqHen m78D3FP+WC3Yk2wZMw+Ub4/gPb3WCAwfLUDvrtao2DFD2GvoCxc5YWsfhf8P/VnXyAfw MDnC9WGoRCmyJkC48hYxonOz1J2kEaRJzqesQoQPDBwfbLT+36KmdDg98YBjHGwWSQhn 6goA== X-Gm-Message-State: ANhLgQ0jGaUAkGD1i2LQvLM4LsGyp+FI+OSQ+7r3yB9CH8LU1UsQZy6k lUihlcZ6K4VYZxJz7QBzmBsL6Gd5F/4= X-Google-Smtp-Source: ADFU+vs3XQiMbRObrxQgVEGV7lw6t8uzgqIuaJnmH0FHX3Q5tD4gW1HSlLepK1rkHKtCDGqbymv46g== X-Received: by 2002:a17:902:9a93:: with SMTP id w19mr4418459plp.277.1585410410482; Sat, 28 Mar 2020 08:46:50 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id s27sm6138502pgn.90.2020.03.28.08.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Mar 2020 08:46:49 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Mar 2020 21:16:41 +0530 Message-Id: <20200328154641.1515-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200328154641.1515-1-gautamramk@gmail.com> References: <20200328154641.1515-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v6 2/2] libavcodec/jpeg2000dec.c: Handle non EOC streams 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 allows decoding of j2k streams which do not have an EOC marker. OpenJPEG implements a similar check. --- libavcodec/jpeg2000dec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 55fab00152..4f923d620d 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2078,8 +2078,12 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) len = bytestream2_get_be16(&s->g); if (len < 2 || bytestream2_get_bytes_left(&s->g) < len - 2) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid len %d left=%d\n", len, bytestream2_get_bytes_left(&s->g)); - return AVERROR_INVALIDDATA; + if (s->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid len %d left=%d\n", len, bytestream2_get_bytes_left(&s->g)); + return AVERROR_INVALIDDATA; + } + av_log(s->avctx, AV_LOG_WARNING, "Mising EOC Marker.\n"); + return 0; } switch (marker) {