Replaced usage of exported aom_codec_av1_*_algo structures with the corresponding aom_codec_av1_*() functions. On Windows, importing data from a library requires that it's explicitly done with __declspec(dllimport). Change-Id: Ida2e84482de5e302d0f9319f7064827e7c4de1eb
diff --git a/test/codec_factory.h b/test/codec_factory.h index 5873801..01c9f1a 100644 --- a/test/codec_factory.h +++ b/test/codec_factory.h
@@ -79,7 +79,7 @@ protected: virtual aom_codec_iface_t *CodecInterface() const { #if CONFIG_AV1_DECODER - return &aom_codec_av1_dx_algo; + return aom_codec_av1_dx(); #else return NULL; #endif @@ -95,7 +95,7 @@ protected: virtual aom_codec_iface_t *CodecInterface() const { #if CONFIG_AV1_ENCODER - return &aom_codec_av1_cx_algo; + return aom_codec_av1_cx(); #else return NULL; #endif @@ -137,7 +137,7 @@ virtual aom_codec_err_t DefaultEncoderConfig(aom_codec_enc_cfg_t *cfg, int usage) const { #if CONFIG_AV1_ENCODER - return aom_codec_enc_config_default(&aom_codec_av1_cx_algo, cfg, usage); + return aom_codec_enc_config_default(aom_codec_av1_cx(), cfg, usage); #else (void)cfg; (void)usage;
diff --git a/test/coding_path_sync.cc b/test/coding_path_sync.cc index 0a4694f..c8ab545 100644 --- a/test/coding_path_sync.cc +++ b/test/coding_path_sync.cc
@@ -27,7 +27,7 @@ class CompressedSource { public: explicit CompressedSource(int seed) : rnd_(seed), frame_count_(0) { - aom_codec_iface_t *algo = &aom_codec_av1_cx_algo; + aom_codec_iface_t *algo = aom_codec_av1_cx(); aom_codec_enc_cfg_t cfg; aom_codec_enc_config_default(algo, &cfg, 0); @@ -140,7 +140,7 @@ class Decoder { public: explicit Decoder(int allowLowbitdepth) { - aom_codec_iface_t *algo = &aom_codec_av1_dx_algo; + aom_codec_iface_t *algo = aom_codec_av1_dx(); aom_codec_dec_cfg_t cfg = aom_codec_dec_cfg_t(); cfg.allow_lowbitdepth = allowLowbitdepth;
diff --git a/test/decode_api_test.cc b/test/decode_api_test.cc index 67f5a91..9112ac2 100644 --- a/test/decode_api_test.cc +++ b/test/decode_api_test.cc
@@ -22,7 +22,7 @@ TEST(DecodeAPI, InvalidParams) { static const aom_codec_iface_t *kCodecs[] = { #if CONFIG_AV1_DECODER - &aom_codec_av1_dx_algo, + aom_codec_av1_dx(), #endif }; uint8_t buf[1] = { 0 };
diff --git a/test/encode_api_test.cc b/test/encode_api_test.cc index 32eb554..0eeb7c0 100644 --- a/test/encode_api_test.cc +++ b/test/encode_api_test.cc
@@ -21,7 +21,7 @@ TEST(EncodeAPI, InvalidParams) { static const aom_codec_iface_t *kCodecs[] = { #if CONFIG_AV1_ENCODER - &aom_codec_av1_cx_algo, + aom_codec_av1_cx(), #endif }; uint8_t buf[1] = { 0 };