avcodec: add xbm parser

diff --git a/Changelog b/Changelog
index 2a68b56bbab74c8604e183bd65f2435c8e9b7f04..bb109a0dd109fb195d0c7673961d90aae08d5e8b 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -65,6 +65,7 @@ version <next>:
 - PFM encoder
 - colorcorrect filter
 - binka demuxer
+- XBM parser
 
 
 version 4.3:

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index ab2e5ad30800bd4412192628e9a684b359901803..2ddf021f04d12480fda9b236dcbfa1fa80e7c521 100644 (file)
--- 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 3156b86b037fdd6ba734c7c294036a476cd6ac5f..93af25ac14c91e45a29e75c9cd12691bf1d4e9eb 100644 (file)
--- 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/version.h b/libavcodec/version.h
index 3cac8c5f3065db3ff06887e4c9db3cb6daa6e0a1..21e6fbf0e100c9ecb93fb10f5190c6d3f5903547 100644 (file)
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,7 +28,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR  58
-#define LIBAVCODEC_VERSION_MINOR 120
+#define LIBAVCODEC_VERSION_MINOR 121
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

diff --git a/libavcodec/xbm_parser.c b/libavcodec/xbm_parser.c
new file mode 100644 (file)
index 0000000..30d2320
--- /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,
+};