Remove the aom_codec_stream_info_t size field.
The aom_codec_stream_info struct had an `sz` field. It looks like
this was intended to implement polymorphism, where individual
codecs under the aom API could extend the struct with additional
members while maintaining common fields like frame size.
However, no codec-specific initializer was ever provided,
requiring callers to manually set this field to the expected
value. The extension mechanism isn't used by the av1 codec,
and also wasn't used by the vp8 or vp9 codecs in the libvpx
implementation.
Since it's not used, this commit removes the layer of indirection,
removing the confusing initialization burden and using
aom_codec_stream_info_t directly within the av1 decoder.
Change-Id: I4372a286b1d03518345c83b01c2f51db6cefe211
diff --git a/av1/av1_dx_iface.c b/av1/av1_dx_iface.c
index f20ea48..8f06909 100644
--- a/av1/av1_dx_iface.c
+++ b/av1/av1_dx_iface.c
@@ -31,8 +31,6 @@
#include "av1/av1_iface_common.h"
-typedef aom_codec_stream_info_t av1_stream_info_t;
-
// This limit is due to framebuffer numbers.
// TODO(hkuang): Remove this limit after implementing ondemand framebuffers.
#define FRAME_CACHE_SIZE 6 // Cache maximum 6 decoded frames.
@@ -45,7 +43,7 @@
struct aom_codec_alg_priv {
aom_codec_priv_t base;
aom_codec_dec_cfg_t cfg;
- av1_stream_info_t si;
+ aom_codec_stream_info_t si;
int postproc_cfg_set;
aom_postproc_cfg_t postproc_cfg;
aom_decrypt_cb decrypt_cb;
@@ -101,7 +99,6 @@
ctx->priv = (aom_codec_priv_t *)priv;
ctx->priv->init_flags = ctx->init_flags;
- priv->si.sz = sizeof(priv->si);
priv->flushed = 0;
// Only do frame parallel decode when threads > 1.
priv->frame_parallel_decode =
@@ -263,11 +260,7 @@
static aom_codec_err_t decoder_get_si(aom_codec_alg_priv_t *ctx,
aom_codec_stream_info_t *si) {
- const size_t sz = (si->sz >= sizeof(av1_stream_info_t))
- ? sizeof(av1_stream_info_t)
- : sizeof(aom_codec_stream_info_t);
- memcpy(si, &ctx->si, sz);
- si->sz = (unsigned int)sz;
+ memcpy(si, &ctx->si, sizeof(*si));
return AOM_CODEC_OK;
}
