From patchwork Tue Mar 31 12:02:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18528 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 97D94449278 for ; Tue, 31 Mar 2020 15:03:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8261F68B0BF; Tue, 31 Mar 2020 15:03:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C1C068B11E for ; Tue, 31 Mar 2020 15:03:09 +0300 (EEST) Received: by mail-pf1-f174.google.com with SMTP id u65so20078pfb.4 for ; Tue, 31 Mar 2020 05:03:09 -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=loHsACYnsBEzjgx3P6KulE9cpwwCmaEh27HadOZKI4iLbg6fwjgi7vf0g/qhJsjSqJ 9qFFCi8WZXeaPY78RQBDAYayrfThj6hzU1G016a7yctKdKmC+huuVO/UGA3z3y3Lb+5x 3+lYgiO/oYSAB0c93/ddWIvlvq1DdLN3A0SvvVtadQ9cjfBCY782SEfnP99IEFSzHiJk j8DcdBVh/7G20f5eQFqx+gSvtyhUAjz9w7BQyBmf+XoLHXJonR7x75CoD6SAGTj0+g7k zmApkSPf7qeGYhRXtYktzzKbUHdnduBBpoDBy/eHtymAmoi4v6VMOb5WLbtIWFzC2ySx 7Ymg== 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=idQxnFsaH66uzUoxPzS5MsvRImmj8bs8y2pK16aDJuY0DCL44oO6tZTbdW32ImIZ+O cuvwCop5YWWZ1O+9uRAMc7quCrIZ0QZLp2XwuGAUnjxYPO1197CE7/7bHL2tyI904kBp j9s0P2KBMbwb+Ni3kuiu1q2l6JUIZyJy+qIqz6ZwjSuIBa23Fb1nX05VShmzegWpeAMb MSlPTYEeE9lP9CoGznP+CMac1fMgmgNYZ5LngdZO4D4hqAMCZsxYXe+eURX5ZS/TPBlN gAeUNLkDY+GtvagIRSVCW+7sm96Su6Q3d8vCNlbUeTTaABYii0ulY8nRgR7Eozc5HcLN 16+Q== X-Gm-Message-State: AGi0PuYBasYCVKLut9Y1TOgb88rBZ3QIATKnlPRZ6M3RkLTmVQEtX0co 3tX+lCEH28kbGO6HHGTtSpGKFdRcar0= X-Google-Smtp-Source: APiQypIz3+8kntD3hH55p9zEOcrQuOiRMQ8sFivrzk3MCkWXeNFl+g5GAcN/0tBif69qvn3CCl4yNg== X-Received: by 2002:a63:c04e:: with SMTP id z14mr8164733pgi.359.1585656186840; Tue, 31 Mar 2020 05:03:06 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id o11sm1809396pjb.18.2020.03.31.05.03.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 05:03:06 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Mar 2020 17:32:42 +0530 Message-Id: <20200331120242.28648-3-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200331120242.28648-1-gautamramk@gmail.com> References: <20200331120242.28648-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v9 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) {