From patchwork Sun Apr 19 20:06:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 19093 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 C8C1044A36E for ; Sun, 19 Apr 2020 23:12:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9554868B81E; Sun, 19 Apr 2020 23:12:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f193.google.com (mail-vk1-f193.google.com [209.85.221.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3280368B682 for ; Sun, 19 Apr 2020 23:12:30 +0300 (EEST) Received: by mail-vk1-f193.google.com with SMTP id i185so2033994vki.12 for ; Sun, 19 Apr 2020 13:12:30 -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; bh=S2kjoOkdpg6Gxl+uAqOGD+XDEkRBwdsrT3luL3EHQXA=; b=jMJdH4iZrp2OaiqErDQniSOX9IFsy/90SrEGz+os60OYHMdl9zN+xxy55Xg3FbOIb4 717uB3rEZ8kt9GGl0w0rBMsDYclQvSu89h/V2ter4pG89zOmZAoDUA+rujD+tNqenI8I FVIOQ6T+78hOc3vXdM3NwzFLAaE+Huz9DhP2a0XtQmJgKsYVp88c+f+vK2D5oCqqV3IH 6ntrWVCjD6xzjmEaSrb9KCRoFuSGYXEpVhWggFGackxn0C4cw4O2w40O6WdguDULjB21 RvatkCq42LbwAi7zxkC8URsc2LaV9UxZkblC7lhctGdFrjR4mD9/Z+4bT8X+cvwOWEeT /8Xg== 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; bh=S2kjoOkdpg6Gxl+uAqOGD+XDEkRBwdsrT3luL3EHQXA=; b=cUs74Wn/dzLkvvbpHFOtZhQoaHG6k2v/iM5sqB1yPixEfwha7jKFlKgYxGw+uhKZ1Y wPHtmQJVg7GQ+cDX33fD8qg9o/lIJzRpUjL7FyDoNtRjvbpXZ4uIL63SU/9yICeMQ5hG pIDabNYdX018hwXN0/e6cyUWbuo5LSxFFyCnSBTIRrDHIFV93YMpFsRqB4pBYe8cYtiV IZXdKTw8UlVzcxrJl8vYjS59j4256NfKPrqMvut8Cp1W4lYUflB6JSVU8KgCewQzCC2F v2oHGkqeM1vF2uu0a4+j2zRF4inUriX/qTP0KQhn3BAWdWbdML5foVOa37E8DZxgQL8G cmUQ== X-Gm-Message-State: AGi0PuYqUWi6wE3sfpF8iCZkJNB0iiIfO2H1ps95FTbVUHY20CKYDmux JuwnJRbaNcF2R2nSAY1I0P1xDsOvC54= X-Google-Smtp-Source: APiQypKpKfESD0ZeUEIzVn5i5pPdH3KB3QoW4f40VHMRympwogJbVL9kZYCpRXkm2bTWN63jAhsbHw== X-Received: by 2002:aa7:94b5:: with SMTP id a21mr13317464pfl.290.1587326813625; Sun, 19 Apr 2020 13:06:53 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id a22sm18081122pga.28.2020.04.19.13.06.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Apr 2020 13:06:53 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Apr 2020 01:36:47 +0530 Message-Id: <20200419200647.16861-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [RFC PATCH v2] libavcodec/jpeg2000_parser: Add jpeg2000 parser 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 I have attempted to write a JPEG2000 Parser. Need help on testing the code and some tips on how to document this code. The variable names are also a bit hard to understand. Would appreciate some tips. The sample from #7445 seems to get decoded now. Additionally, I have fixed a bug pointed by Michael. This was because the EOC marker was appearing inside comments. --- libavcodec/Makefile | 1 + libavcodec/jpeg2000_parser.c | 156 +++++++++++++++++++++++++++++++++++ libavcodec/parsers.c | 1 + 3 files changed, 158 insertions(+) create mode 100644 libavcodec/jpeg2000_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 88944d9a3a..dedd7a0429 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1062,6 +1062,7 @@ OBJS-$(CONFIG_H261_PARSER) += h261_parser.o OBJS-$(CONFIG_H263_PARSER) += h263_parser.o OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264_sei.o h264data.o OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o hevc_data.o +OBJS-$(CONFIG_JPEG2000_PARSER) += jpeg2000_parser.o OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o OBJS-$(CONFIG_MLP_PARSER) += mlp_parse.o mlp_parser.o mlp.o OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \ diff --git a/libavcodec/jpeg2000_parser.c b/libavcodec/jpeg2000_parser.c new file mode 100644 index 0000000000..3d6bbe8ef7 --- /dev/null +++ b/libavcodec/jpeg2000_parser.c @@ -0,0 +1,156 @@ +/* + * JPEG2000 parser + * Copyright (c) 2000, 2001 Fabrice Bellard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * JPEG2000 parser. + */ + +#include "parser.h" + +typedef struct JPEG2000ParserContext{ + ParseContext pc; + uint64_t bytes_read; + uint64_t fheader_state; + uint16_t skip_bytes; // ignore any bytes in comments of codestream + uint8_t fheader_read; + uint8_t frame_type; // 1 if file, 2 if codestream + uint8_t reading_file_header; + uint8_t skipped_codestream; + uint8_t codestream_frame_end; +}JPEG2000ParserContext; + +static inline void reset_context(JPEG2000ParserContext *m) +{ + ParseContext *pc = &m->pc; + + pc->frame_start_found= 0; + pc->state = 0; + m->bytes_read = 0; + m->frame_type = 0; + m->skipped_codestream = 0; + m->fheader_read = 0; + m->fheader_state = 0; + m->reading_file_header = 0; + m->codestream_frame_end = 0; + m->skip_bytes = 0; +} +/** + * Find the end of the current frame in the bitstream. + * @return the position of the first byte of the next frame, or -1 + */ +static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_size) +{ + ParseContext *pc= &m->pc; + int i; + uint32_t state; + state= pc->state; + + if (buf_size == 0) { + return 0; + } + + for (i = 0; i < buf_size; i++) { + state = state << 8 | buf[i]; + m->bytes_read++; + if (m->skip_bytes) { + m->skip_bytes--; + continue; + } + if (m->codestream_frame_end) { + reset_context(m); + return i; + } + if (m->reading_file_header) { + m->fheader_state = m->fheader_state << 8 | buf[i]; + m->fheader_read++; + if (m->fheader_read == 8) { + if (m->fheader_state == 0x6A5020200D0A870A) { + if (pc->frame_start_found) { + pc->frame_start_found = 0; + reset_context(m); + return i - 11; + } else { + pc->frame_start_found = 1; + m->frame_type = 1; + } + } + m->reading_file_header = 0; + m->fheader_read = 0; + } + } + if (state == 0x0000000C && m->bytes_read >= 3) { + m->reading_file_header = 1; + } else if ((state & 0xFFFF) == 0xFF4F) { + if (!pc->frame_start_found) { + pc->frame_start_found = 1; + m->frame_type = 2; + } else if (pc->frame_start_found && m->frame_type == 1 && m->skipped_codestream) { + reset_context(m); + return i - 1; + } + } else if ((state & 0xFFFF) == 0xFFD9) { + if (pc->frame_start_found && m->frame_type == 1) { + m->skipped_codestream = 1; + } else if (pc->frame_start_found && m->frame_type == 2) { + m->codestream_frame_end = 1; + } + } else if (pc->frame_start_found && (state & 0xFFFF0000) == 0xFF640000) { + m->skip_bytes = (state & 0xFFFF); + } + } + + pc->state= state; + return END_NOT_FOUND; +} + +static int jpeg2000_parse(AVCodecParserContext *s, + AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + JPEG2000ParserContext *m = s->priv_data; + ParseContext *pc = &m->pc; + int next; + + if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){ + next= buf_size; + }else{ + next= find_frame_end(m, buf, buf_size); + + if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + } + + *poutbuf = buf; + *poutbuf_size = buf_size; + return next; +} + +AVCodecParser ff_jpeg2000_parser = { + .codec_ids = { AV_CODEC_ID_JPEG2000 }, + .priv_data_size = sizeof(JPEG2000ParserContext), + .parser_parse = jpeg2000_parse, + .parser_close = ff_parse_close, +}; \ No newline at end of file diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index 9fbf182594..7d75cea830 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -48,6 +48,7 @@ extern AVCodecParser ff_h261_parser; extern AVCodecParser ff_h263_parser; extern AVCodecParser ff_h264_parser; extern AVCodecParser ff_hevc_parser; +extern AVCodecParser ff_jpeg2000_parser; extern AVCodecParser ff_mjpeg_parser; extern AVCodecParser ff_mlp_parser; extern AVCodecParser ff_mpeg4video_parser;