From: James Almer
Signed-off-by: James Almer
Signed-off-by: Luca Barbato
---
libavcodec/av1_parse.c | 103
libavcodec/av1_parse.h | 126 +
2 files changed, 229 insertions(+)
create mode 100644 libavcodec/av1_parse.c
create mode 100644 libavcodec/av1_parse.h
diff --git a/libavcodec/av1_parse.c b/libavcodec/av1_parse.c
new file mode 100644
index 00..45dbef379f
--- /dev/null
+++ b/libavcodec/av1_parse.c
@@ -0,0 +1,103 @@
+/*
+ * AV1 common parsing code
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#include "libavutil/mem.h"
+
+#include "av1_parse.h"
+#include "bytestream.h"
+
+int ff_av1_extract_obu(AV1OBU *obu, const uint8_t *buf, int length, void
*logctx)
+{
+int64_t obu_size;
+int start_pos, type, temporal_id, spatial_id;
+
+int ret = parse_obu_header(buf, length, &obu_size, &start_pos,
+ &type, &temporal_id, &spatial_id);
+if (ret < 0)
+return ret;
+
+if (obu_size > INT_MAX / 8 || obu_size < 0)
+return AVERROR(ERANGE);
+
+obu->type= type;
+obu->temporal_id = temporal_id;
+obu->spatial_id = spatial_id;
+
+length = obu_size + start_pos;
+
+obu->data = buf + start_pos;
+obu->size = obu_size;
+obu->raw_data = buf;
+obu->raw_size = length;
+
+ret = init_get_bits(&obu->gb, obu->data, obu->size * 8);
+if (ret < 0)
+return ret;
+
+av_log(logctx, AV_LOG_DEBUG,
+ "obu_type: %d, temporal_id: %d, spatial_id: %d, payload size: %d\n",
+ obu->type, obu->temporal_id, obu->spatial_id, obu->size);
+
+return length;
+}
+
+int ff_av1_packet_split(AV1Packet *pkt, const uint8_t *buf, int length, void
*logctx)
+{
+GetByteContext bc;
+int consumed;
+
+bytestream2_init(&bc, buf, length);
+pkt->nb_obus = 0;
+
+while (bytestream2_get_bytes_left(&bc) > 0) {
+AV1OBU *obu;
+
+if (pkt->obus_allocated < pkt->nb_obus + 1) {
+int new_size = pkt->obus_allocated + 1;
+AV1OBU *tmp = av_realloc_array(pkt->obus, new_size, sizeof(*tmp));
+if (!tmp)
+return AVERROR(ENOMEM);
+
+pkt->obus = tmp;
+memset(pkt->obus + pkt->obus_allocated, 0,
+ (new_size - pkt->obus_allocated) * sizeof(*tmp));
+pkt->obus_allocated = new_size;
+}
+obu = &pkt->obus[pkt->nb_obus];
+
+consumed = ff_av1_extract_obu(obu, bc.buffer,
bytestream2_get_bytes_left(&bc), logctx);
+if (consumed < 0)
+return consumed;
+
+pkt->nb_obus++;
+
+bytestream2_skip(&bc, consumed);
+}
+
+return 0;
+}
+
+void ff_av1_packet_uninit(AV1Packet *pkt)
+{
+av_freep(&pkt->obus);
+pkt->obus_allocated = 0;
+}
diff --git a/libavcodec/av1_parse.h b/libavcodec/av1_parse.h
new file mode 100644
index 00..5e2337d5e4
--- /dev/null
+++ b/libavcodec/av1_parse.h
@@ -0,0 +1,126 @@
+/*
+ * AV1 common parsing code
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_AV1_PARSE_H
+#define AVCODEC_AV1_PARSE_H
+
+#include
+
+#include "avcodec.h"
+#include "get_bits.h"
+
+typedef struct AV1OBU {
+/** Size of payload */
+int size;
+const uint8_t *data;
+
+/** Size of entire OBU, including header */
+int raw_size;
+const uint8_t *raw_data;
+
+/** GetBitContext initialized to the start of the payload */
+GetBitContext gb;
+
+int type;
