#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;
- 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);
+ len = parse_obu_header(buf, length, &obu_size, &start_pos,
+ &type, &temporal_id, &spatial_id);
+ if (len < 0)
+ return len;
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;
+ obu->raw_size = len;
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;
+ return len;
}
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 (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));
+ AV1OBU *tmp;
+
+ if (new_size >= INT_MAX / sizeof(*tmp))
+ return AVERROR(ENOMEM);
+ tmp = av_fast_realloc(pkt->obus, &pkt->obus_allocated_size, 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));
+ memset(pkt->obus + pkt->obus_allocated, 0, sizeof(*pkt->obus));
pkt->obus_allocated = new_size;
}
obu = &pkt->obus[pkt->nb_obus];
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;
void ff_av1_packet_uninit(AV1Packet *pkt)
{
av_freep(&pkt->obus);
- pkt->obus_allocated = 0;
+ pkt->obus_allocated = pkt->obus_allocated_size = 0;
}