avcodec: add cri parser

diff --git a/Changelog b/Changelog
index c41b22c888606fdb00e619ffa86777cbb681a803..c1a7385c81af83f2bd9e43a5ca876a7e25b36399 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -68,6 +68,7 @@ version <next>:
 - XBM parser
 - xbm_pipe demuxer
 - colorize filter
+- CRI parser
 
 
 version 4.3:

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 8820e9ce7c11e0aef859ca20bd695a99177ee089..77a4b8ca380275216dd5234a73d4ce277ef8935f 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1084,6 +1084,7 @@ OBJS-$(CONFIG_AVS3_PARSER)             += avs3_parser.o
 OBJS-$(CONFIG_BMP_PARSER)              += bmp_parser.o
 OBJS-$(CONFIG_CAVSVIDEO_PARSER)        += cavs_parser.o
 OBJS-$(CONFIG_COOK_PARSER)             += cook_parser.o
+OBJS-$(CONFIG_CRI_PARSER)              += cri_parser.o
 OBJS-$(CONFIG_DCA_PARSER)              += dca_parser.o dca_exss.o dca.o
 OBJS-$(CONFIG_DIRAC_PARSER)            += dirac_parser.o
 OBJS-$(CONFIG_DNXHD_PARSER)            += dnxhd_parser.o dnxhddata.o

diff --git a/libavcodec/cri_parser.c b/libavcodec/cri_parser.c
new file mode 100644 (file)
index 0000000..9790747
--- /dev/null
+++ b/libavcodec/cri_parser.c
@@ -0,0 +1,105 @@
+/*
+ * CRI 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
+ * CRI parser
+ */
+
+#include "libavutil/bswap.h"
+#include "libavutil/common.h"
+
+#include "parser.h"
+
+typedef struct CRIParser {
+    ParseContext pc;
+    int count;
+    int chunk;
+    int read_bytes;
+    int skip_bytes;
+} CRIParser;
+
+#define KEY (((uint64_t)'\1' << 56) | ((uint64_t)'\0' << 48) | \
+             ((uint64_t)'\0' << 40) | ((uint64_t)'\0' << 32) | \
+             ((uint64_t)'\4' << 24) | ((uint64_t)'\0' << 16) | \
+             ((uint64_t)'\0' <<  8) | ((uint64_t)'\0' <<  0))
+
+static int cri_parse(AVCodecParserContext *s, AVCodecContext *avctx,
+                     const uint8_t **poutbuf, int *poutbuf_size,
+                     const uint8_t *buf, int buf_size)
+{
+    CRIParser *bpc = s->priv_data;
+    uint64_t state = bpc->pc.state64;
+    int next = END_NOT_FOUND, i = 0;
+
+    s->pict_type = AV_PICTURE_TYPE_I;
+    s->key_frame = 1;
+    s->duration  = 1;
+
+    *poutbuf_size = 0;
+    *poutbuf = NULL;
+
+    for (; i < buf_size; i++) {
+        state = (state << 8) | buf[i];
+        bpc->read_bytes++;
+
+        if (bpc->skip_bytes > 0) {
+            bpc->skip_bytes--;
+            if (bpc->skip_bytes == 0)
+                bpc->read_bytes = 0;
+        } else {
+            if (state != KEY)
+                continue;
+        }
+
+        if (bpc->skip_bytes == 0 && bpc->read_bytes >= 8) {
+            bpc->skip_bytes = av_bswap32(state & 0xFFFFFFFF);
+            bpc->chunk = state >> 32;
+            bpc->read_bytes = 0;
+            bpc->count++;
+        }
+
+        if (bpc->chunk == 0x01000000 && bpc->skip_bytes == 4 &&
+            bpc->read_bytes == 0 && bpc->count > 1) {
+            next = i - 7;
+            break;
+        }
+    }
+
+    bpc->pc.state64 = state;
+    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_cri_parser = {
+    .codec_ids      = { AV_CODEC_ID_CRI },
+    .priv_data_size = sizeof(CRIParser),
+    .parser_parse   = cri_parse,
+    .parser_close   = ff_parse_close,
+};

diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c
index 93af25ac14c91e45a29e75c9cd12691bf1d4e9eb..f8cfa1cde9021f23388bb866a6c16bcfa35874df 100644 (file)
--- a/libavcodec/parsers.c
+++ b/libavcodec/parsers.c
@@ -33,6 +33,7 @@ extern AVCodecParser ff_avs3_parser;
 extern AVCodecParser ff_bmp_parser;
 extern AVCodecParser ff_cavsvideo_parser;
 extern AVCodecParser ff_cook_parser;
+extern AVCodecParser ff_cri_parser;
 extern AVCodecParser ff_dca_parser;
 extern AVCodecParser ff_dirac_parser;
 extern AVCodecParser ff_dnxhd_parser;

diff --git a/libavcodec/version.h b/libavcodec/version.h
index 21e6fbf0e100c9ecb93fb10f5190c6d3f5903547..afd54a8bf443462dbfd6dede51256e71ee87fece 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 121
+#define LIBAVCODEC_VERSION_MINOR 122
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \