#include "libavutil/mem.h"
+#include "av1.h"
#include "av1_parse.h"
#include "bytestream.h"
{
int64_t obu_size;
int start_pos, type, temporal_id, spatial_id;
- int len, ret;
+ int len;
len = parse_obu_header(buf, length, &obu_size, &start_pos,
&type, &temporal_id, &spatial_id);
if (len < 0)
return len;
- 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;
obu->raw_data = buf;
obu->raw_size = len;
- 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);
int ff_av1_packet_split(AV1Packet *pkt, const uint8_t *buf, int length, void *logctx)
{
GetByteContext bc;
- int consumed;
+ int ret, consumed;
bytestream2_init(&bc, buf, length);
pkt->nb_obus = 0;
if (consumed < 0)
return consumed;
+ bytestream2_skip(&bc, consumed);
+
+ obu->size_bits = get_obu_bit_length(obu->data, obu->size, obu->type);
+
+ if (obu->size_bits < 0 || (!obu->size_bits && obu->type != AV1_OBU_TEMPORAL_DELIMITER)) {
+ av_log(logctx, AV_LOG_ERROR, "Invalid OBU of type %d, skipping.\n", obu->type);
+ continue;
+ }
+
pkt->nb_obus++;
- bytestream2_skip(&bc, consumed);
+ ret = init_get_bits(&obu->gb, obu->data, obu->size_bits);
+ if (ret < 0)
+ return ret;
}
return 0;
#include <stdint.h>
+#include "av1.h"
#include "avcodec.h"
#include "get_bits.h"
int size;
const uint8_t *data;
+ /**
+ * Size, in bits, of just the data, excluding the trailing_one_bit and
+ * any trailing padding.
+ */
+ int size_bits;
+
/** Size of entire OBU, including header */
int raw_size;
const uint8_t *raw_data;
return size;
}
+static inline int get_obu_bit_length(const uint8_t *buf, int size, int type)
+{
+ int v;
+
+ /* There are no trailing bits on these */
+ if (type == AV1_OBU_TILE_GROUP || type == AV1_OBU_FRAME) {
+ if (size > INT_MAX / 8)
+ return AVERROR(ERANGE);
+ else
+ return size * 8;
+ }
+
+ while (size > 0 && buf[size - 1] == 0)
+ size--;
+
+ if (!size)
+ return 0;
+
+ v = buf[size - 1];
+
+ if (size > INT_MAX / 8)
+ return AVERROR(ERANGE);
+ size *= 8;
+
+ /* Remove the trailing_one_bit and following trailing zeros */
+ if (v)
+ size -= ff_ctz(v) + 1;
+
+ return size;
+}
+
#endif /* AVCODEC_AV1_PARSE_H */