From patchwork Fri Apr 3 18:27:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18613 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 80D9B44B191 for ; Fri, 3 Apr 2020 21:28:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 641DB68AE7B; Fri, 3 Apr 2020 21:28:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3411E68A477 for ; Fri, 3 Apr 2020 21:28:10 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id ay1so3044476plb.0 for ; Fri, 03 Apr 2020 11:28: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=sQw0W/CnVxnvcidlgaEk71Ku4derDNM3/knZfZqEt+Q=; b=uVTXfilRwGSxZRg3tK6imUK0B/EIbU+W/oxlhztbZX8hj7amAWJuBrm8UZVph6IbMv siPiJ7020mnLh8sAHeAL6XCNCHpghsb/PC1zyers4uQXV899VWwTCobL4KMs39ucSL4a vyEJNdboMVziBj+c80SWLB4X5dRIcX/7wmiSl8LrA8rcIDX54KhU8E94+bw2WoNeC6Fr ciNfJivZAISN7ZccjXgI07tPTnkvZ6CFDHmbTGmzLzxqNPhzhiZ2/+e9y6j6F3MJ7JQd 4c5mpbQXWutnE5OgNnZLCuBR2ssd5tKn8614Act1zQWMgFfNLcgewcdgXUFc/3yJw+3b FPWg== 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=sQw0W/CnVxnvcidlgaEk71Ku4derDNM3/knZfZqEt+Q=; b=hOZGUKxJB9xNUIL7XUyJwQ6dsvTxAEh2jZuh1B2y7+f+ZVGZMEWal2niw9dsg+4mnz I1cMmco5NILWIRTlaBdApE9053xC7HnUpqlL92PmKbVSr7oyMGQuYmY+jdoTreTwkmkS JjCWdtqdYTTH5nDm4YG3k8Yr6J1HFKaPph9cvxC9DSorh4YBA48pp5tBgFjKAxZAEUSg 6fAKTP2BGky2OmFe0+LMg9+RHLfjjN9XswVWcHbH1wdQTV1R9l3dB6VDW9HWcqlA6r0T cjWRVdDH9/S8SjlkzXqZSL4/mZ9AWlF2g+zDpuuPp4W067+ccxOOaN4TXssR6Zw729rC 702A== X-Gm-Message-State: AGi0Pua81krK2BAi+9OtW/Ji4/Mm1o9hX1G4QQoZUO+mDET+S8qrRa9y OZdg2neXTyzHYAIe+/GAS3mtSpOl2Ek= X-Google-Smtp-Source: APiQypKPq2V7HqUVUmRkSIrLGBNbFkRo3u7jnfbRK+0PRx4IxFQSa+QvSIGfVAqjcnSMG7kXOr7rqw== X-Received: by 2002:a17:90a:252b:: with SMTP id j40mr11345712pje.189.1585938487761; Fri, 03 Apr 2020 11:28:07 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id u41sm5865292pgn.8.2020.04.03.11.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 11:28:07 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Apr 2020 23:57:57 +0530 Message-Id: <20200403182758.12671-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200403182758.12671-1-gautamramk@gmail.com> References: <20200403182758.12671-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v10 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 02905b9e49..32a09c6d5c 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2006,8 +2006,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) {