shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Renaming VP9D_CONFIG to VP9DecoderConfig."

--- a/vp9/decoder/vp9_decoder.c

+++ b/vp9/decoder/vp9_decoder.c

@@ -110,7 +110,7 @@

   }

 }

-VP9Decoder *vp9_decoder_create(const VP9D_CONFIG *oxcf) {

+VP9Decoder *vp9_decoder_create(const VP9DecoderConfig *oxcf) {

   VP9Decoder *const pbi = vpx_memalign(32, sizeof(*pbi));

   VP9_COMMON *const cm = pbi ? &pbi->common : NULL;

--- a/vp9/decoder/vp9_decoder.h

+++ b/vp9/decoder/vp9_decoder.h

@@ -27,13 +27,13 @@

 extern "C" {

 #endif

-typedef struct {

+typedef struct VP9DecoderConfig {

   int width;

   int height;

   int version;

   int max_threads;

   int inv_tile_order;

-} VP9D_CONFIG;

+} VP9DecoderConfig;

 typedef struct VP9Decoder {

   DECLARE_ALIGNED(16, MACROBLOCKD, mb);

@@ -40,7 +40,7 @@

   DECLARE_ALIGNED(16, VP9_COMMON, common);

-  VP9D_CONFIG oxcf;

+  VP9DecoderConfig oxcf;

   int64_t last_time_stamp;

   int ready_for_new_data;

@@ -81,7 +81,7 @@

                           int index, YV12_BUFFER_CONFIG **fb);

-struct VP9Decoder *vp9_decoder_create(const VP9D_CONFIG *oxcf);

+struct VP9Decoder *vp9_decoder_create(const VP9DecoderConfig *oxcf);

 void vp9_decoder_remove(struct VP9Decoder *pbi);

--- a/vp9/vp9_dx_iface.c

+++ b/vp9/vp9_dx_iface.c

@@ -227,7 +227,7 @@

 }

 static void init_decoder(vpx_codec_alg_priv_t *ctx) {

-  VP9D_CONFIG oxcf;

+  VP9DecoderConfig oxcf;

   oxcf.width = ctx->si.w;

   oxcf.height = ctx->si.h;

   oxcf.version = 9;