#define RWContext GetBitContext
#define xf(width, name, var, subs, ...) do { \
- uint32_t value = 0; \
+ uint32_t value; \
CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, \
SUBSCRIPTS(subs, __VA_ARGS__), \
&value, 0, (1 << width) - 1)); \
var = value; \
} while (0)
#define xs(width, name, var, subs, ...) do { \
- int32_t value = 0; \
+ int32_t value; \
CHECK(cbs_vp9_read_s(ctx, rw, width, #name, \
SUBSCRIPTS(subs, __VA_ARGS__), &value)); \
var = value; \
#define increment(name, min, max) do { \
- uint32_t value = 0; \
+ uint32_t value; \
CHECK(cbs_vp9_read_increment(ctx, rw, min, max, #name, &value)); \
current->name = value; \
} while (0)
#define prob(name, subs, ...) do { \
uint8_t prob_coded; \
- int8_t prob; \
+ uint8_t prob; \
xf(1, name.prob_coded, prob_coded, subs, __VA_ARGS__); \
if (prob_coded) \
xf(8, name.prob, prob, subs, __VA_ARGS__); \
current->name = prob; \
} while (0)
+#define fixed(width, name, value) do { \
+ av_unused uint32_t fixed_value; \
+ CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, \
+ 0, &fixed_value, value, value)); \
+ } while (0)
+
#define infer(name, value) do { \
current->name = value; \
} while (0)
#undef fle
#undef delta_q
#undef prob
+#undef fixed
#undef infer
#undef byte_alignment
xf(8, name.prob, current->name, subs, __VA_ARGS__); \
} while (0)
+#define fixed(width, name, value) do { \
+ CHECK(ff_cbs_write_unsigned(ctx, rw, width, #name, \
+ 0, value, value, value)); \
+ } while (0)
+
#define infer(name, value) do { \
if (current->name != (value)) { \
av_log(ctx->log_ctx, AV_LOG_WARNING, "Warning: " \
#include "cbs_vp9_syntax_template.c"
-#undef READ
+#undef WRITE
#undef READWRITE
#undef RWContext
#undef xf
#undef fle
#undef delta_q
#undef prob
+#undef fixed
#undef infer
#undef byte_alignment
}
if (pos + index_size != frag->data_size) {
av_log(ctx->log_ctx, AV_LOG_WARNING, "Extra padding at "
- "end of superframe: %zu bytes.\n",
+ "end of superframe: %"SIZE_SPECIFIER" bytes.\n",
frag->data_size - (pos + index_size));
}
return 0;
}
-static void cbs_vp9_free_frame(void *unit, uint8_t *content)
+static void cbs_vp9_free_frame(void *opaque, uint8_t *content)
{
VP9RawFrame *frame = (VP9RawFrame*)content;
av_buffer_unref(&frame->data_ref);
if (err < 0) {
av_log(ctx->log_ctx, AV_LOG_ERROR, "Unable to allocate a "
"sufficiently large write buffer (last attempt "
- "%zu bytes).\n", priv->write_buffer_size);
+ "%"SIZE_SPECIFIER" bytes).\n", priv->write_buffer_size);
return err;
}
}