From patchwork Wed Feb 3 13:10:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 25369 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 37C01449149 for ; Wed, 3 Feb 2021 15:10:35 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 06A4C689DB2; Wed, 3 Feb 2021 15:10:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4C27680C53 for ; Wed, 3 Feb 2021 15:10:28 +0200 (EET) Received: by mail-ej1-f42.google.com with SMTP id hs11so35670849ejc.1 for ; Wed, 03 Feb 2021 05:10:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=25q/dMNgWovUVc5CeqVygyrcFNv5XrdUMJx8lbNh4rc=; b=fK2p1kcOfwYFJLLKy96MtlN1vnFIKFkcYff5UD5AzOoycmH8eLU9q4zHmGowA9jde7 rTcqsTdPqAW6DrMZTQo0Iip38Phue9upQMg2YyS2gBaxeuQX1xofQTsxOGD2UEC7TfMG lJxuXXiHC4c7Wkam8Aniyd1eaTysVt9x4/v95FcSnSQRMAWObrngwu9S9JuhOw5sZGdN c0DspwrPPDBMAk9G5yFyvKSwl903ZRFGZdNIPe9Y28VViIxy2JqX+JKa5KQk+NjkM0hG BWvR6AKTPMRxxE8bcBIusEJMCy+j8xY+OdTsun41yj/yOi+03g1VzL9wRk+ZBIyldVRP MVnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=25q/dMNgWovUVc5CeqVygyrcFNv5XrdUMJx8lbNh4rc=; b=eiL5W8xkBl01KnX+dnqjie7CI68hqMp/cn+reBrVAHor/5/chhsW4thkJaw6geLweU Ixihg+AVRDOo8Gb/X0wZBursNp/6ypnOo/K/6jfkViwHO9vskSgf4xgOqVBgDSxwzAZA zpbw3VKHpWezw6y363CbVn9YGE85AZ7N4ZFxixuNmrzWN0FltDcCjH5bOl5tWxAkC8Vk oaOYcUKJB8XJmk/LkYkZauMGHyB54vCHppBnClGLT5t1H53llwp00bFXIVqvrSl3Ixd/ WFmCV6geyuYWEZF+KuRxiOvP926ruSW+qtTD4Vi64D9Ak3aN77S1UkLIQnB2FWgkzzF/ r4ZA== X-Gm-Message-State: AOAM532gS8NG5936EV8VuL0o+x2NWluVBQQy1ghpZK3WJsKROhl7Jr03 bSkwBcpYLMgkeg5svWHdqMIGDOwxJeBHRA== X-Google-Smtp-Source: ABdhPJwLZ2UnpNSnuVBrWQJtqHxRuKdL01aaGBPah7tuQ7SCyMwjrgcdqjRqqlJxVlnkHPMcxLQ/XA== X-Received: by 2002:a17:906:1be9:: with SMTP id t9mr3055052ejg.527.1612357828225; Wed, 03 Feb 2021 05:10:28 -0800 (PST) Received: from localhost.localdomain ([31.45.254.141]) by smtp.gmail.com with ESMTPSA id p10sm864649edj.2.2021.02.03.05.10.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 05:10:27 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Feb 2021 14:10:18 +0100 Message-Id: <20210203131019.7235-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec: add xbm 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/Makefile | 1 + libavcodec/parsers.c | 1 + libavcodec/xbm_parser.c | 101 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 libavcodec/xbm_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index ab2e5ad308..2ddf021f04 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1127,6 +1127,7 @@ OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o OBJS-$(CONFIG_VP8_PARSER) += vp8_parser.o OBJS-$(CONFIG_VP9_PARSER) += vp9_parser.o OBJS-$(CONFIG_WEBP_PARSER) += webp_parser.o +OBJS-$(CONFIG_XBM_PARSER) += xbm_parser.o OBJS-$(CONFIG_XMA_PARSER) += xma_parser.o # bitstream filters diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index 3156b86b03..93af25ac14 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -72,6 +72,7 @@ extern AVCodecParser ff_vp3_parser; extern AVCodecParser ff_vp8_parser; extern AVCodecParser ff_vp9_parser; extern AVCodecParser ff_webp_parser; +extern AVCodecParser ff_xbm_parser; extern AVCodecParser ff_xma_parser; #include "libavcodec/parser_list.c" diff --git a/libavcodec/xbm_parser.c b/libavcodec/xbm_parser.c new file mode 100644 index 0000000000..30d23200db --- /dev/null +++ b/libavcodec/xbm_parser.c @@ -0,0 +1,101 @@ +/* + * XBM parser + * Copyright (c) 2021 Paul B Mahol + * + * 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 + * XBM parser + */ + +#include "libavutil/common.h" + +#include "parser.h" + +typedef struct XBMParseContext { + ParseContext pc; + uint16_t state16; + int count; +} XBMParseContext; + +#define KEY (((uint64_t)'\n' << 56) | ((uint64_t)'#' << 48) | ((uint64_t)'d' << 40) | ((uint64_t)'e' << 32) | ((uint64_t)'f' << 24) | ('i' << 16) | ('n' << 8) | ('e' << 0)) +#define END ((';' << 8) | ('\n' << 0)) + +static int xbm_init(AVCodecParserContext *s) +{ + XBMParseContext *bpc = s->priv_data; + + bpc->count = 1; + + return 0; +} + +static int xbm_parse(AVCodecParserContext *s, AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + XBMParseContext *bpc = s->priv_data; + uint64_t state = bpc->pc.state64; + uint16_t state16 = bpc->state16; + int next = END_NOT_FOUND, i = 0; + + s->pict_type = AV_PICTURE_TYPE_NONE; + s->duration = 1; + + *poutbuf_size = 0; + *poutbuf = NULL; + + for (; i < buf_size; i++) { + state = (state << 8) | buf[i]; + state16 = (state16 << 8) | buf[i]; + + if (state == KEY) + bpc->count++; + + if ((state == KEY && bpc->count == 1)) { + next = i - 6; + break; + } else if (state16 == END) { + next = i + 1; + bpc->count = 0; + break; + } + } + + bpc->pc.state64 = state; + bpc->state16 = state16; + if (ff_combine_frame(&bpc->pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + + *poutbuf = buf; + *poutbuf_size = buf_size; + + return next; +} + +AVCodecParser ff_xbm_parser = { + .codec_ids = { AV_CODEC_ID_XBM }, + .priv_data_size = sizeof(XBMParseContext), + .parser_init = xbm_init, + .parser_parse = xbm_parse, + .parser_close = ff_parse_close, +};