if (ctx->trace_enable)
position = put_bits_count(pbc);
- if (value == 0) {
- zeroes = 0;
- put_bits(pbc, 1, 1);
- } else {
- zeroes = av_log2(value + 1);
- v = value - (1 << zeroes) + 1;
- put_bits(pbc, zeroes + 1, 1);
- put_bits(pbc, zeroes, v);
- }
+ zeroes = av_log2(value + 1);
+ v = value - (1U << zeroes) + 1;
+ put_bits(pbc, zeroes, 0);
+ put_bits(pbc, 1, 1);
+ put_bits(pbc, zeroes, v);
if (ctx->trace_enable) {
char bits[65];
break;
}
+ if (value > UINT32_MAX)
+ return AVERROR_INVALIDDATA;
+
if (ctx->trace_enable)
ff_cbs_trace_syntax_element(ctx, position, name, NULL, "", value);
return 0;
}
-static int cbs_av1_read_su(CodedBitstreamContext *ctx, GetBitContext *gbc,
- int width, const char *name,
- const int *subscripts, int32_t *write_to)
-{
- int position;
- int32_t value;
-
- if (ctx->trace_enable)
- position = get_bits_count(gbc);
-
- if (get_bits_left(gbc) < width) {
- av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid signed value at "
- "%s: bitstream ended.\n", name);
- return AVERROR_INVALIDDATA;
- }
-
- value = get_sbits(gbc, width);
-
- if (ctx->trace_enable) {
- char bits[33];
- int i;
- for (i = 0; i < width; i++)
- bits[i] = value & (1 << (width - i - 1)) ? '1' : '0';
- bits[i] = 0;
-
- ff_cbs_trace_syntax_element(ctx, position,
- name, subscripts, bits, value);
- }
-
- *write_to = value;
- return 0;
-}
-
-static int cbs_av1_write_su(CodedBitstreamContext *ctx, PutBitContext *pbc,
- int width, const char *name,
- const int *subscripts, int32_t value)
-{
- if (put_bits_left(pbc) < width)
- return AVERROR(ENOSPC);
-
- if (ctx->trace_enable) {
- char bits[33];
- int i;
- for (i = 0; i < width; i++)
- bits[i] = value & (1 << (width - i - 1)) ? '1' : '0';
- bits[i] = 0;
-
- ff_cbs_trace_syntax_element(ctx, put_bits_count(pbc),
- name, subscripts, bits, value);
- }
-
- put_sbits(pbc, width, value);
-
- return 0;
-}
-
static int cbs_av1_read_ns(CodedBitstreamContext *ctx, GetBitContext *gbc,
uint32_t n, const char *name,
const int *subscripts, uint32_t *write_to)
{
- uint32_t w, m, v, extra_bit, value;
- int position;
+ uint32_t m, v, extra_bit, value;
+ int position, w;
av_assert0(n > 0);
return diff;
}
+static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc)
+{
+ GetBitContext tmp = *gbc;
+ size_t size = 0;
+ for (int i = 0; get_bits_left(&tmp) >= 8; i++) {
+ if (get_bits(&tmp, 8))
+ size = i;
+ }
+ return size;
+}
+
#define HEADER(name) do { \
ff_cbs_trace_header(ctx, name); \
#define SUBSCRIPTS(subs, ...) (subs > 0 ? ((int[subs + 1]){ subs, __VA_ARGS__ }) : NULL)
#define fb(width, name) \
- xf(width, name, current->name, 0, MAX_UINT_BITS(width), 0)
+ xf(width, name, current->name, 0, MAX_UINT_BITS(width), 0, )
#define fc(width, name, range_min, range_max) \
- xf(width, name, current->name, range_min, range_max, 0)
+ xf(width, name, current->name, range_min, range_max, 0, )
#define flag(name) fb(1, name)
#define su(width, name) \
- xsu(width, name, current->name, 0)
+ xsu(width, name, current->name, 0, )
#define fbs(width, name, subs, ...) \
xf(width, name, current->name, 0, MAX_UINT_BITS(width), subs, __VA_ARGS__)
#define fixed(width, name, value) do { \
av_unused uint32_t fixed_value = value; \
- xf(width, name, fixed_value, value, value, 0); \
+ xf(width, name, fixed_value, value, value, 0, ); \
} while (0)
#define RWContext GetBitContext
#define xf(width, name, var, range_min, range_max, subs, ...) do { \
- uint32_t value = range_min; \
+ uint32_t value; \
CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, \
SUBSCRIPTS(subs, __VA_ARGS__), \
&value, range_min, range_max)); \
} while (0)
#define xsu(width, name, var, subs, ...) do { \
- int32_t value = 0; \
- CHECK(cbs_av1_read_su(ctx, rw, width, #name, \
- SUBSCRIPTS(subs, __VA_ARGS__), &value)); \
+ int32_t value; \
+ CHECK(ff_cbs_read_signed(ctx, rw, width, #name, \
+ SUBSCRIPTS(subs, __VA_ARGS__), &value, \
+ MIN_INT_BITS(width), \
+ MAX_INT_BITS(width))); \
var = value; \
} while (0)
#define uvlc(name, range_min, range_max) do { \
- uint32_t value = range_min; \
+ uint32_t value; \
CHECK(cbs_av1_read_uvlc(ctx, rw, #name, \
&value, range_min, range_max)); \
current->name = value; \
} while (0)
#define ns(max_value, name, subs, ...) do { \
- uint32_t value = 0; \
+ uint32_t value; \
CHECK(cbs_av1_read_ns(ctx, rw, max_value, #name, \
SUBSCRIPTS(subs, __VA_ARGS__), &value)); \
current->name = value; \
} while (0)
#define increment(name, min, max) do { \
- uint32_t value = 0; \
+ uint32_t value; \
CHECK(cbs_av1_read_increment(ctx, rw, min, max, #name, &value)); \
current->name = value; \
} while (0)
#define subexp(name, max, subs, ...) do { \
- uint32_t value = 0; \
+ uint32_t value; \
CHECK(cbs_av1_read_subexp(ctx, rw, max, #name, \
SUBSCRIPTS(subs, __VA_ARGS__), &value)); \
current->name = value; \
#define delta_q(name) do { \
uint8_t delta_coded; \
int8_t delta_q; \
- xf(1, name.delta_coded, delta_coded, 0, 1, 0); \
+ xf(1, name.delta_coded, delta_coded, 0, 1, 0, ); \
if (delta_coded) \
- xsu(1 + 6, name.delta_q, delta_q, 0); \
+ xsu(1 + 6, name.delta_q, delta_q, 0, ); \
else \
delta_q = 0; \
current->name = delta_q; \
} while (0)
#define leb128(name) do { \
- uint64_t value = 0; \
+ uint64_t value; \
CHECK(cbs_av1_read_leb128(ctx, rw, #name, &value)); \
current->name = value; \
} while (0)
#undef xf
#undef xsu
#undef uvlc
-#undef leb128
#undef ns
#undef increment
#undef subexp
} while (0)
#define xsu(width, name, var, subs, ...) do { \
- CHECK(cbs_av1_write_su(ctx, rw, width, #name, \
- SUBSCRIPTS(subs, __VA_ARGS__), var)); \
+ CHECK(ff_cbs_write_signed(ctx, rw, width, #name, \
+ SUBSCRIPTS(subs, __VA_ARGS__), var, \
+ MIN_INT_BITS(width), \
+ MAX_INT_BITS(width))); \
} while (0)
#define uvlc(name, range_min, range_max) do { \
} while (0)
#define delta_q(name) do { \
- xf(1, name.delta_coded, current->name != 0, 0, 1, 0); \
+ xf(1, name.delta_coded, current->name != 0, 0, 1, 0, ); \
if (current->name) \
- xsu(1 + 6, name.delta_q, current->name, 0); \
+ xsu(1 + 6, name.delta_q, current->name, 0, ); \
} while (0)
#define leb128(name) do { \
#define infer(name, value) do { \
if (current->name != (value)) { \
- av_log(ctx->log_ctx, AV_LOG_WARNING, "Warning: " \
+ av_log(ctx->log_ctx, AV_LOG_ERROR, \
"%s does not match inferred value: " \
"%"PRId64", but should be %"PRId64".\n", \
#name, (int64_t)current->name, (int64_t)(value)); \
+ return AVERROR_INVALIDDATA; \
} \
} while (0)
#include "cbs_av1_syntax_template.c"
-#undef READ
+#undef WRITE
#undef READWRITE
#undef RWContext
#undef xf
#undef xsu
#undef uvlc
-#undef leb128
#undef ns
#undef increment
#undef subexp
#undef delta_q
+#undef leb128
#undef infer
#undef byte_alignment
if (err < 0)
goto fail;
- if (get_bits_left(&gbc) < 8) {
- av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU: fragment "
- "too short (%"SIZE_SPECIFIER" bytes).\n", size);
- err = AVERROR_INVALIDDATA;
- goto fail;
- }
-
if (header.obu_has_size_field) {
+ if (get_bits_left(&gbc) < 8) {
+ av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid OBU: fragment "
+ "too short (%"SIZE_SPECIFIER" bytes).\n", size);
+ err = AVERROR_INVALIDDATA;
+ goto fail;
+ }
err = cbs_av1_read_leb128(ctx, &gbc, "obu_size", &obu_size);
if (err < 0)
goto fail;
goto fail;
}
- err = ff_cbs_insert_unit_data(ctx, frag, -1, header.obu_type,
+ err = ff_cbs_insert_unit_data(frag, -1, header.obu_type,
data, obu_length, frag->data_ref);
if (err < 0)
goto fail;
return err;
}
-static void cbs_av1_free_tile_data(AV1RawTileData *td)
-{
- av_buffer_unref(&td->data_ref);
-}
-
-static void cbs_av1_free_metadata(AV1RawMetadata *md)
-{
- switch (md->metadata_type) {
- case AV1_METADATA_TYPE_ITUT_T35:
- av_buffer_unref(&md->metadata.itut_t35.payload_ref);
- break;
- }
-}
-
-static void cbs_av1_free_obu(void *unit, uint8_t *content)
-{
- AV1RawOBU *obu = (AV1RawOBU*)content;
-
- switch (obu->header.obu_type) {
- case AV1_OBU_TILE_GROUP:
- cbs_av1_free_tile_data(&obu->obu.tile_group.tile_data);
- break;
- case AV1_OBU_FRAME:
- cbs_av1_free_tile_data(&obu->obu.frame.tile_group.tile_data);
- break;
- case AV1_OBU_TILE_LIST:
- cbs_av1_free_tile_data(&obu->obu.tile_list.tile_data);
- break;
- case AV1_OBU_METADATA:
- cbs_av1_free_metadata(&obu->obu.metadata);
- break;
- }
-
- av_freep(&obu);
-}
-
static int cbs_av1_ref_tile_data(CodedBitstreamContext *ctx,
CodedBitstreamUnit *unit,
GetBitContext *gbc,
GetBitContext gbc;
int err, start_pos, end_pos;
- err = ff_cbs_alloc_unit_content(ctx, unit, sizeof(*obu),
- &cbs_av1_free_obu);
+ err = ff_cbs_alloc_unit_content2(ctx, unit);
if (err < 0)
return err;
obu = unit->content;
start_pos = get_bits_count(&gbc);
if (obu->header.obu_extension_flag) {
- priv->temporal_id = obu->header.temporal_id;
- priv->spatial_id = obu->header.temporal_id;
-
if (obu->header.obu_type != AV1_OBU_SEQUENCE_HEADER &&
obu->header.obu_type != AV1_OBU_TEMPORAL_DELIMITER &&
priv->operating_point_idc) {
// Decoding will drop this OBU at this operating point.
}
}
- } else {
- priv->temporal_id = 0;
- priv->spatial_id = 0;
}
switch (obu->header.obu_type) {
}
break;
case AV1_OBU_PADDING:
+ {
+ err = cbs_av1_read_padding_obu(ctx, &gbc, &obu->obu.padding);
+ if (err < 0)
+ return err;
+ }
+ break;
default:
return AVERROR(ENOSYS);
}
if (obu->obu_size > 0 &&
obu->header.obu_type != AV1_OBU_TILE_GROUP &&
+ obu->header.obu_type != AV1_OBU_TILE_LIST &&
obu->header.obu_type != AV1_OBU_FRAME) {
int nb_bits = obu->obu_size * 8 + start_pos - end_pos;
}
break;
case AV1_OBU_PADDING:
+ {
+ err = cbs_av1_write_padding_obu(ctx, pbc, &obu->obu.padding);
+ if (err < 0)
+ return err;
+ }
+ break;
default:
return AVERROR(ENOSYS);
}
return AVERROR(ENOSPC);
if (obu->obu_size > 0) {
- memmove(priv->write_buffer + data_pos,
- priv->write_buffer + start_pos, header_size);
+ memmove(pbc->buf + data_pos,
+ pbc->buf + start_pos, header_size);
skip_put_bytes(pbc, header_size);
if (td) {
- memcpy(priv->write_buffer + data_pos + header_size,
+ memcpy(pbc->buf + data_pos + header_size,
td->data, td->data_size);
skip_put_bytes(pbc, td->data_size);
}
}
- return 0;
-}
-
-static int cbs_av1_write_unit(CodedBitstreamContext *ctx,
- CodedBitstreamUnit *unit)
-{
- CodedBitstreamAV1Context *priv = ctx->priv_data;
- PutBitContext pbc;
- int err;
-
- if (!priv->write_buffer) {
- // Initial write buffer size is 1MB.
- priv->write_buffer_size = 1024 * 1024;
-
- reallocate_and_try_again:
- err = av_reallocp(&priv->write_buffer, priv->write_buffer_size);
- if (err < 0) {
- av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a "
- "sufficiently large write buffer (last attempt "
- "%"SIZE_SPECIFIER" bytes).\n", priv->write_buffer_size);
- return err;
- }
- }
-
- init_put_bits(&pbc, priv->write_buffer, priv->write_buffer_size);
-
- err = cbs_av1_write_obu(ctx, unit, &pbc);
- if (err == AVERROR(ENOSPC)) {
- // Overflow.
- priv->write_buffer_size *= 2;
- goto reallocate_and_try_again;
- }
- if (err < 0)
- return err;
-
- // Overflow but we didn't notice.
- av_assert0(put_bits_count(&pbc) <= 8 * priv->write_buffer_size);
-
// OBU data must be byte-aligned.
- av_assert0(put_bits_count(&pbc) % 8 == 0);
-
- unit->data_size = put_bits_count(&pbc) / 8;
- flush_put_bits(&pbc);
-
- err = ff_cbs_alloc_unit_data(ctx, unit, unit->data_size);
- if (err < 0)
- return err;
-
- memcpy(unit->data, priv->write_buffer, unit->data_size);
+ av_assert0(put_bits_count(pbc) % 8 == 0);
return 0;
}
av_buffer_unref(&priv->sequence_header_ref);
av_buffer_unref(&priv->frame_header_ref);
+}
+
+static void cbs_av1_free_metadata(void *unit, uint8_t *content)
+{
+ AV1RawOBU *obu = (AV1RawOBU*)content;
+ AV1RawMetadata *md;
+
+ av_assert0(obu->header.obu_type == AV1_OBU_METADATA);
+ md = &obu->obu.metadata;
- av_freep(&priv->write_buffer);
+ switch (md->metadata_type) {
+ case AV1_METADATA_TYPE_ITUT_T35:
+ av_buffer_unref(&md->metadata.itut_t35.payload_ref);
+ break;
+ }
}
+static const CodedBitstreamUnitTypeDescriptor cbs_av1_unit_types[] = {
+ CBS_UNIT_TYPE_POD(AV1_OBU_SEQUENCE_HEADER, AV1RawOBU),
+ CBS_UNIT_TYPE_POD(AV1_OBU_TEMPORAL_DELIMITER, AV1RawOBU),
+ CBS_UNIT_TYPE_POD(AV1_OBU_FRAME_HEADER, AV1RawOBU),
+ CBS_UNIT_TYPE_POD(AV1_OBU_REDUNDANT_FRAME_HEADER, AV1RawOBU),
+
+ CBS_UNIT_TYPE_INTERNAL_REF(AV1_OBU_TILE_GROUP, AV1RawOBU,
+ obu.tile_group.tile_data.data),
+ CBS_UNIT_TYPE_INTERNAL_REF(AV1_OBU_FRAME, AV1RawOBU,
+ obu.frame.tile_group.tile_data.data),
+ CBS_UNIT_TYPE_INTERNAL_REF(AV1_OBU_TILE_LIST, AV1RawOBU,
+ obu.tile_list.tile_data.data),
+ CBS_UNIT_TYPE_INTERNAL_REF(AV1_OBU_PADDING, AV1RawOBU,
+ obu.padding.payload),
+
+ CBS_UNIT_TYPE_COMPLEX(AV1_OBU_METADATA, AV1RawOBU,
+ &cbs_av1_free_metadata),
+
+ CBS_UNIT_TYPE_END_OF_LIST
+};
+
const CodedBitstreamType ff_cbs_type_av1 = {
.codec_id = AV_CODEC_ID_AV1,
.priv_data_size = sizeof(CodedBitstreamAV1Context),
+ .unit_types = cbs_av1_unit_types,
+
.split_fragment = &cbs_av1_split_fragment,
.read_unit = &cbs_av1_read_unit,
- .write_unit = &cbs_av1_write_unit,
+ .write_unit = &cbs_av1_write_obu,
.assemble_fragment = &cbs_av1_assemble_fragment,
.close = &cbs_av1_close,
projects / ffmpeg / blobdiff