From patchwork Sat Apr 4 07:44:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18628 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 E17634491A2 for ; Sat, 4 Apr 2020 10:51:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B9D1768B172; Sat, 4 Apr 2020 10:51:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA96868AD2F for ; Sat, 4 Apr 2020 10:51:44 +0300 (EEST) Received: by mail-pg1-f172.google.com with SMTP id x7so4787202pgh.5 for ; Sat, 04 Apr 2020 00:51:44 -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=V8MZ00evsOIJwXQ9xf5NOmyPf5eL6ksIA1+3XKqZCic=; b=rjBaJ6wHZWtp62LMRhGl45Nl7bvNxzXPTTWLDhYVo4nBji8duTUiue1YKIR9mLAFUW v421UY808A4plB60+35YFb8LI9hKxLs+MdNYTWtIg9eMmOu1lzr0iDoa93mpNy6mwas8 NEZkMQ67qvR4epIi/Lb/Y8AnmiTsi3HwOzvuEN/xbiONNi0nSX0XZmfIaYiYz7dIWvvY mO1Ix+tthzm3umY9kbhDC2F8ZKKzKPm5hoUUNnND5Ox+dy41k5gLExxGGiAPYv2idBJa hcdErJufhd1NMfIS8gH4O2TxZr42gjF6RCv6MCuzMSAfDg1GnMZCprV+kBIy/3FdQ4iz Ub6Q== 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=V8MZ00evsOIJwXQ9xf5NOmyPf5eL6ksIA1+3XKqZCic=; b=LQXl1nUA/4klT4hPQtm4vCU9ujb2rJhNhePoo8Ck/t43byEyfqWUYHEsidGj/b1a9t BFRM+3PuIKnjBPh9ngDX8xHKR963+0kHQl/UDb9hvfuRLk3tmlL3coR4KdPY1Z52yLpa 8xedgoJHpiPyWh1BjkOLgnHre9nHWqX8IPC/bcRFXQ3PzYO6TiTd16npGU20A+xfyyfL IBEPXwG1FZHTiIwP+w/+udfnSazYydjsBQRYT6ePKRtbfiZckhTYW05PFFIulI/g6H96 bGMljVDFLyxCeLMCBHG7l//UrmmiJAQ0fcTx2i1dApC3K8Pqj+/+GfISw43bLsTBY3Q+ vQrw== X-Gm-Message-State: AGi0PuZ/mc8qsHUfxXTPpKyFoGOsZ7jhsKaCXvU1pJEpEx1+WrJI4bXI VFQ3fJz7NIwSsXgmPlJJg5CwBZ5yR8w= X-Google-Smtp-Source: APiQypJG5MadmQg1IS/uW4c92y3NnZhlFQV4K6WN7CE8h5Eyse7xhR7qi8HAzhO3I/AI7wb/yVfOWA== X-Received: by 2002:a63:c212:: with SMTP id b18mr11262114pgd.92.1585986301743; Sat, 04 Apr 2020 00:45:01 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id t66sm7154972pjb.45.2020.04.04.00.44.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Apr 2020 00:45:01 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Apr 2020 13:14:52 +0530 Message-Id: <20200404074453.23620-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200404074453.23620-1-gautamramk@gmail.com> References: <20200404074453.23620-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v11 2/3] 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. --- libavcodec/jpeg2000dec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 01509d62c1..f2039fa8c1 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2002,8 +2002,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, "Missing EOC Marker.\n"); + break; } switch (marker) {