From patchwork Mon Mar 30 05:06:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18499 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 7828344AF15 for ; Mon, 30 Mar 2020 08:06:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E03D68B57B; Mon, 30 Mar 2020 08:06:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3855B68B5EE for ; Mon, 30 Mar 2020 08:06:49 +0300 (EEST) Received: by mail-pj1-f45.google.com with SMTP id ng8so7062447pjb.2 for ; Sun, 29 Mar 2020 22:06:49 -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=YFRGrLAQYNRi+jdIXVhEUgBjkbDzqSbRSQ6u1/M3H64=; b=Ss3qxG1Q4OaWTh2ZC2i8porGUtDIgn7X3+XKVzBG9ZX4carDPcCOMfv47UJJpmQHrR fSHq6Lm7bUwKnp6JcsnHBjOjtWxdwvyqW0QGSukTVcwOqyihbjb5Ya5KpNt0BOoIxlT7 /vL7FnWTfnVsoXIngXyMxUq+2M3S0CT0verazHEIev2Q9l+XDcuQZD7ZOl6twDKBL/sh C3diJkeJXmboSWh2vQdrVQ3t6xAVnHxyx209TlvqjJn9K/SsRq9u/ATo4cVxiz7OVNL7 5VbZzOgqF+DQI6YASmPwkS4heXXDGMSbCcA/SLPTcEJy/kQPP+528aMUEGweG22oFrJX 89sA== 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=YFRGrLAQYNRi+jdIXVhEUgBjkbDzqSbRSQ6u1/M3H64=; b=ELnCDg7fqEbWs4QxNjvIF+1Xn83cs8Y4K8p1GzCKNIuDwmyVlIxD5Zt678jRvSmb9i vusdM63mAJdqnZGrhfPWKfkYKONH93LpdBzokgn9cCyta3VgHVzHvVypaqnls/P4CDLN VGNh5+SL7S0+thiy4je/EgEa+SJ4q+GqAC0JKU8UqE/x2twOQ0yHoZdsi8C4c+8eQH2m JsLsgyKtwJ9zogBoLLgZedFRJqjpLrR4b+2McRhxbFjAsSFGZk8aGia9ECA+D+UkOx5p yNFQEG4c/oWwK/RQUP93+PP7njWd/y2IFgJ9BF+9JLz/HUhFwaI7P6CFTB+/m3Yn90s/ fBgg== X-Gm-Message-State: AGi0PubggsHnr0wPqA6T2Pu9yLfjh1Su4Hm922eNRGUsXRgyx3jREJG8 8NI0gCbnkuiDeK0C6MBpfBMHMg4iEni24g== X-Google-Smtp-Source: APiQypJpnqs07KcNrM+GYSzPUK8muoSMH6zEZczW23U7whxs3FNwQTxh53DJVOaAA7AVBSkHYWluAQ== X-Received: by 2002:a17:90a:a40d:: with SMTP id y13mr4591866pjp.116.1585544807150; Sun, 29 Mar 2020 22:06:47 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id b17sm9416560pff.81.2020.03.29.22.06.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 22:06:46 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Mar 2020 10:36:32 +0530 Message-Id: <20200330050632.17563-3-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200330050632.17563-1-gautamramk@gmail.com> References: <20200330050632.17563-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v7 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 71f1245fc1..a319297ae7 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2080,8 +2080,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"); + break; } switch (marker) {