From f332c6305ec55fb2bc98198721696fcf0283b0ae Mon Sep 17 00:00:00 2001 From: Deb Mukherjee Date: Tue, 15 Jul 2014 16:55:12 -0700 Subject: [PATCH] Renames interface field in VpxInterface Renames interface to codec_interface since it is a reserved word on windows. Change-Id: I84f2cbf257a4c44f16dc2464127e35ee405c2c3e --- examples/decode_to_md5.c | 4 ++-- examples/decode_with_drops.c | 4 ++-- examples/postproc.c | 4 ++-- examples/set_maps.c | 6 +++--- examples/simple_decoder.c | 4 ++-- examples/simple_encoder.c | 6 +++--- examples/twopass_encoder.c | 6 +++--- examples/vp8cx_set_ref.c | 6 +++--- examples/vpx_temporal_svc_encoder.c | 6 +++--- tools_common.h | 2 +- vpxdec.c | 7 ++++--- vpxenc.c | 10 +++++----- 12 files changed, 33 insertions(+), 32 deletions(-) diff --git a/examples/decode_to_md5.c b/examples/decode_to_md5.c index 28d1ad569..1c56303e3 100644 --- a/examples/decode_to_md5.c +++ b/examples/decode_to_md5.c @@ -104,9 +104,9 @@ int main(int argc, char **argv) { if (!decoder) die("Unknown input codec."); - printf("Using %s\n", vpx_codec_iface_name(decoder->interface())); + printf("Using %s\n", vpx_codec_iface_name(decoder->codec_interface())); - if (vpx_codec_dec_init(&codec, decoder->interface(), NULL, 0)) + if (vpx_codec_dec_init(&codec, decoder->codec_interface(), NULL, 0)) die_codec(&codec, "Failed to initialize decoder"); while (vpx_video_reader_read_frame(reader)) { diff --git a/examples/decode_with_drops.c b/examples/decode_with_drops.c index af1aa636b..a20fdac09 100644 --- a/examples/decode_with_drops.c +++ b/examples/decode_with_drops.c @@ -108,9 +108,9 @@ int main(int argc, char **argv) { if (!decoder) die("Unknown input codec."); - printf("Using %s\n", vpx_codec_iface_name(decoder->interface())); + printf("Using %s\n", vpx_codec_iface_name(decoder->codec_interface())); - if (vpx_codec_dec_init(&codec, decoder->interface(), NULL, 0)) + if (vpx_codec_dec_init(&codec, decoder->codec_interface(), NULL, 0)) die_codec(&codec, "Failed to initialize decoder."); while (vpx_video_reader_read_frame(reader)) { diff --git a/examples/postproc.c b/examples/postproc.c index be08e920b..59c50b139 100644 --- a/examples/postproc.c +++ b/examples/postproc.c @@ -86,9 +86,9 @@ int main(int argc, char **argv) { if (!decoder) die("Unknown input codec."); - printf("Using %s\n", vpx_codec_iface_name(decoder->interface())); + printf("Using %s\n", vpx_codec_iface_name(decoder->codec_interface())); - res = vpx_codec_dec_init(&codec, decoder->interface(), NULL, + res = vpx_codec_dec_init(&codec, decoder->codec_interface(), NULL, VPX_CODEC_USE_POSTPROC); if (res == VPX_CODEC_INCAPABLE) die_codec(&codec, "Postproc not supported by this decoder."); diff --git a/examples/set_maps.c b/examples/set_maps.c index 4ba38ee4d..af8c58255 100644 --- a/examples/set_maps.c +++ b/examples/set_maps.c @@ -193,9 +193,9 @@ int main(int argc, char **argv) { die("Failed to allocate image."); } - printf("Using %s\n", vpx_codec_iface_name(encoder->interface())); + printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface())); - res = vpx_codec_enc_config_default(encoder->interface(), &cfg, 0); + res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0); if (res) die_codec(&codec, "Failed to get default codec config."); @@ -214,7 +214,7 @@ int main(int argc, char **argv) { if (!(infile = fopen(argv[4], "rb"))) die("Failed to open %s for reading.", argv[4]); - if (vpx_codec_enc_init(&codec, encoder->interface(), &cfg, 0)) + if (vpx_codec_enc_init(&codec, encoder->codec_interface(), &cfg, 0)) die_codec(&codec, "Failed to initialize encoder"); while (vpx_img_read(&raw, infile)) { diff --git a/examples/simple_decoder.c b/examples/simple_decoder.c index 8c150510a..33187584c 100644 --- a/examples/simple_decoder.c +++ b/examples/simple_decoder.c @@ -123,9 +123,9 @@ int main(int argc, char **argv) { if (!decoder) die("Unknown input codec."); - printf("Using %s\n", vpx_codec_iface_name(decoder->interface())); + printf("Using %s\n", vpx_codec_iface_name(decoder->codec_interface())); - if (vpx_codec_dec_init(&codec, decoder->interface(), NULL, 0)) + if (vpx_codec_dec_init(&codec, decoder->codec_interface(), NULL, 0)) die_codec(&codec, "Failed to initialize decoder."); while (vpx_video_reader_read_frame(reader)) { diff --git a/examples/simple_encoder.c b/examples/simple_encoder.c index af58091ae..dc9bc06b1 100644 --- a/examples/simple_encoder.c +++ b/examples/simple_encoder.c @@ -207,9 +207,9 @@ int main(int argc, char **argv) { if (keyframe_interval < 0) die("Invalid keyframe interval value."); - printf("Using %s\n", vpx_codec_iface_name(encoder->interface())); + printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface())); - res = vpx_codec_enc_config_default(encoder->interface(), &cfg, 0); + res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0); if (res) die_codec(&codec, "Failed to get default codec config."); @@ -227,7 +227,7 @@ int main(int argc, char **argv) { if (!(infile = fopen(infile_arg, "rb"))) die("Failed to open %s for reading.", infile_arg); - if (vpx_codec_enc_init(&codec, encoder->interface(), &cfg, 0)) + if (vpx_codec_enc_init(&codec, encoder->codec_interface(), &cfg, 0)) die_codec(&codec, "Failed to initialize encoder"); while (vpx_img_read(&raw, infile)) { diff --git a/examples/twopass_encoder.c b/examples/twopass_encoder.c index 8bca18c7e..369b1d890 100644 --- a/examples/twopass_encoder.c +++ b/examples/twopass_encoder.c @@ -168,9 +168,9 @@ int main(int argc, char **argv) { if (!writer) die("Failed to open %s for writing", outfile_arg); - printf("Using %s\n", vpx_codec_iface_name(encoder->interface())); + printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface())); - res = vpx_codec_enc_config_default(encoder->interface(), &cfg, 0); + res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0); if (res) die_codec(&codec, "Failed to get default codec config."); @@ -193,7 +193,7 @@ int main(int argc, char **argv) { if (!(infile = fopen(infile_arg, "rb"))) die("Failed to open %s for reading", infile_arg); - if (vpx_codec_enc_init(&codec, encoder->interface(), &cfg, 0)) + if (vpx_codec_enc_init(&codec, encoder->codec_interface(), &cfg, 0)) die_codec(&codec, "Failed to initialize encoder"); while (vpx_img_read(&raw, infile)) { diff --git a/examples/vp8cx_set_ref.c b/examples/vp8cx_set_ref.c index 9b6d11b28..46a40cae6 100644 --- a/examples/vp8cx_set_ref.c +++ b/examples/vp8cx_set_ref.c @@ -138,9 +138,9 @@ int main(int argc, char **argv) { die("Failed to allocate image."); } - printf("Using %s\n", vpx_codec_iface_name(encoder->interface())); + printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface())); - res = vpx_codec_enc_config_default(encoder->interface(), &cfg, 0); + res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0); if (res) die_codec(&codec, "Failed to get default codec config."); @@ -157,7 +157,7 @@ int main(int argc, char **argv) { if (!(infile = fopen(argv[3], "rb"))) die("Failed to open %s for reading.", argv[3]); - if (vpx_codec_enc_init(&codec, encoder->interface(), &cfg, 0)) + if (vpx_codec_enc_init(&codec, encoder->codec_interface(), &cfg, 0)) die_codec(&codec, "Failed to initialize encoder"); while (vpx_img_read(&raw, infile)) { diff --git a/examples/vpx_temporal_svc_encoder.c b/examples/vpx_temporal_svc_encoder.c index 9f32bd8fe..4c98d5026 100644 --- a/examples/vpx_temporal_svc_encoder.c +++ b/examples/vpx_temporal_svc_encoder.c @@ -466,7 +466,7 @@ int main(int argc, char **argv) { if (!encoder) die("Unsupported codec."); - printf("Using %s\n", vpx_codec_iface_name(encoder->interface())); + printf("Using %s\n", vpx_codec_iface_name(encoder->codec_interface())); width = strtol(argv[4], NULL, 0); height = strtol(argv[5], NULL, 0); @@ -488,7 +488,7 @@ int main(int argc, char **argv) { } // Populate encoder configuration. - res = vpx_codec_enc_config_default(encoder->interface(), &cfg, 0); + res = vpx_codec_enc_config_default(encoder->codec_interface(), &cfg, 0); if (res) { printf("Failed to get config: %s\n", vpx_codec_err_to_string(res)); return EXIT_FAILURE; @@ -566,7 +566,7 @@ int main(int argc, char **argv) { cfg.ss_number_layers = 1; // Initialize codec. - if (vpx_codec_enc_init(&codec, encoder->interface(), &cfg, 0)) + if (vpx_codec_enc_init(&codec, encoder->codec_interface(), &cfg, 0)) die_codec(&codec, "Failed to initialize encoder"); if (strncmp(encoder->name, "vp8", 3) == 0) { diff --git a/tools_common.h b/tools_common.h index 6a9f4f7f0..558413ea4 100644 --- a/tools_common.h +++ b/tools_common.h @@ -120,7 +120,7 @@ int read_yuv_frame(struct VpxInputContext *input_ctx, vpx_image_t *yuv_frame); typedef struct VpxInterface { const char *const name; const uint32_t fourcc; - vpx_codec_iface_t *(*const interface)(); + vpx_codec_iface_t *(*const codec_interface)(); } VpxInterface; int get_vpx_encoder_count(); diff --git a/vpxdec.c b/vpxdec.c index 5c98d2667..1b1cb0578 100644 --- a/vpxdec.c +++ b/vpxdec.c @@ -166,7 +166,7 @@ void usage_exit() { for (i = 0; i < get_vpx_decoder_count(); ++i) { const VpxInterface *const decoder = get_vpx_decoder_by_index(i); fprintf(stderr, " %-6s - %s\n", - decoder->name, vpx_codec_iface_name(decoder->interface())); + decoder->name, vpx_codec_iface_name(decoder->codec_interface())); } exit(EXIT_FAILURE); @@ -286,7 +286,7 @@ int file_is_raw(struct VpxInputContext *input) { if (mem_get_le32(buf) < 256 * 1024 * 1024) { for (i = 0; i < get_vpx_decoder_count(); ++i) { const VpxInterface *const decoder = get_vpx_decoder_by_index(i); - if (!vpx_codec_peek_stream_info(decoder->interface(), + if (!vpx_codec_peek_stream_info(decoder->codec_interface(), buf + 4, 32 - 4, &si)) { is_raw = 1; input->fourcc = decoder->fourcc; @@ -728,7 +728,8 @@ int main_loop(int argc, const char **argv_) { dec_flags = (postproc ? VPX_CODEC_USE_POSTPROC : 0) | (ec_enabled ? VPX_CODEC_USE_ERROR_CONCEALMENT : 0); - if (vpx_codec_dec_init(&decoder, interface->interface(), &cfg, dec_flags)) { + if (vpx_codec_dec_init(&decoder, interface->codec_interface(), + &cfg, dec_flags)) { fprintf(stderr, "Failed to initialize decoder: %s\n", vpx_codec_error(&decoder)); return EXIT_FAILURE; diff --git a/vpxenc.c b/vpxenc.c index 78a1c9013..fcb4368f0 100644 --- a/vpxenc.c +++ b/vpxenc.c @@ -426,7 +426,7 @@ void usage_exit() { for (i = 0; i < get_vpx_encoder_count(); ++i) { const VpxInterface *const encoder = get_vpx_encoder_by_index(i); fprintf(stderr, " %-6s - %s\n", - encoder->name, vpx_codec_iface_name(encoder->interface())); + encoder->name, vpx_codec_iface_name(encoder->codec_interface())); } exit(EXIT_FAILURE); @@ -798,7 +798,7 @@ static struct stream_state *new_stream(struct VpxEncoderConfig *global, vpx_codec_err_t res; /* Populate encoder configuration */ - res = vpx_codec_enc_config_default(global->codec->interface(), + res = vpx_codec_enc_config_default(global->codec->codec_interface(), &stream->config.cfg, global->usage); if (res) @@ -1112,7 +1112,7 @@ static void show_stream_config(struct stream_state *stream, if (stream->index == 0) { fprintf(stderr, "Codec: %s\n", - vpx_codec_iface_name(global->codec->interface())); + vpx_codec_iface_name(global->codec->codec_interface())); fprintf(stderr, "Source file: %s File Type: %s Format: %s\n", input->filename, file_type_to_string(input->file_type), @@ -1262,7 +1262,7 @@ static void initialize_encoder(struct stream_state *stream, flags |= global->out_part ? VPX_CODEC_USE_OUTPUT_PARTITION : 0; /* Construct Encoder Context */ - vpx_codec_enc_init(&stream->encoder, global->codec->interface(), + vpx_codec_enc_init(&stream->encoder, global->codec->codec_interface(), &stream->config.cfg, flags); ctx_exit_on_error(&stream->encoder, "Failed to initialize encoder"); @@ -1283,7 +1283,7 @@ static void initialize_encoder(struct stream_state *stream, #if CONFIG_DECODERS if (global->test_decode != TEST_DECODE_OFF) { const VpxInterface *decoder = get_vpx_decoder_by_name(global->codec->name); - vpx_codec_dec_init(&stream->decoder, decoder->interface(), NULL, 0); + vpx_codec_dec_init(&stream->decoder, decoder->codec_interface(), NULL, 0); } #endif }