From patchwork Mon Mar 30 16:21:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18522 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 D877544AD2E for ; Mon, 30 Mar 2020 19:22:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C57FA68B217; Mon, 30 Mar 2020 19:22:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39ECC68AFE9 for ; Mon, 30 Mar 2020 19:22:10 +0300 (EEST) Received: by mail-pg1-f181.google.com with SMTP id a32so8888960pga.4 for ; Mon, 30 Mar 2020 09:22:10 -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=qyP4FIiTa6B4buFmBTunTWa1lU2Q1kh5yU8zSLUQEoc=; b=X767YQz6ND+kwwcKavH3jSIarcGtBwG/2sav0mF8ufy3XY2h/KRQEzSe97qakQKXoN dciaQ3Fel/AbPcghnJVpxT3Xh1PpQL81f+O2Y0lvwSqTAFzwsnD5WdnUl5NRmshxFR8a jP4xaehAmYND6UT7xCOw/ZmfFruG6imrjwqzXTeSzv3VuIIxXyzLjpysYy97nW+7nrxG k5oc7TTSeSOpWE+f53SOf7kaH+ik4R+91kK8vFkP5GTHZGu78e9hIdTR7e1bTStvvpPS 1Do5NOdYZA07cM5kwdd5jYUzZIGIuY8owEVpXQ1nOOt2xWz/psYSBI3j0BCjdGiRxG30 Cj6g== 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=qyP4FIiTa6B4buFmBTunTWa1lU2Q1kh5yU8zSLUQEoc=; b=Y0MKvQz5Ye2/0dcdYWxF4wGLWA5Rfvuim0Vrmb9w66T/tZoXR1uYG5wAgPpdL1TWyb bpKBLpSjyvBAlhgdRt+3MSihO4je5R3JK5zf3XCRlMRXmQYmJ41P+l/3b6uDIu4Xe8N7 RWuYpa7fTby+oLPrEkQYVJ5iVrTEAcP95Hu1LRivzULCn3GkCpCeYOBHSPPE/Hcs0VML 95oxLMxILRv08kVv6MhzMeGOwjoznpPXL0ilSHtdQ814ZPOj1oT6ptt7VBgDCcmx6jYH HQF1bwH3v9ySP2kIUqeBoNqvc4reQIwOX1Go7ktchwRp5rsFHiuvlX/rn8dc+YO3wEfN pd2Q== X-Gm-Message-State: AGi0Pub7FlnbSjAxhkuoeirhTu531+ZuxXBlkkeXZ52VONBpBjCnL7/g +zs+nO0GC6AYyHiv3jchf2WXJGnpsgM= X-Google-Smtp-Source: APiQypIVle6WATsUhhQD/eLMXWee5ui5QT7Brr9rW3nnotzZ4nfxGCOtDbQA/iTfgJwQDKOMc29+Hg== X-Received: by 2002:aa7:9f42:: with SMTP id h2mr51089pfr.22.1585585328249; Mon, 30 Mar 2020 09:22:08 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id r59sm10840127pjb.45.2020.03.30.09.22.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2020 09:22:07 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Mar 2020 21:51:55 +0530 Message-Id: <20200330162155.6901-3-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200330162155.6901-1-gautamramk@gmail.com> References: <20200330162155.6901-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v8 3/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 23e43ff052..d27d753992 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2085,8 +2085,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) {