shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Renames interface field in VpxInterface"

--- a/examples/decode_to_md5.c

+++ b/examples/decode_to_md5.c

@@ -104,9 +104,9 @@

   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)) {

--- a/examples/decode_with_drops.c

+++ b/examples/decode_with_drops.c

@@ -108,9 +108,9 @@

   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)) {

--- a/examples/postproc.c

+++ b/examples/postproc.c

@@ -86,9 +86,9 @@

   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.");

--- a/examples/set_maps.c

+++ b/examples/set_maps.c

@@ -193,9 +193,9 @@

     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 @@

   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)) {

--- a/examples/simple_decoder.c

+++ b/examples/simple_decoder.c

@@ -123,9 +123,9 @@

   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)) {

--- a/examples/simple_encoder.c

+++ b/examples/simple_encoder.c

@@ -207,9 +207,9 @@

   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 @@

   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)) {

--- a/examples/twopass_encoder.c

+++ b/examples/twopass_encoder.c

@@ -168,9 +168,9 @@

   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 @@

     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)) {

--- a/examples/vp8cx_set_ref.c

+++ b/examples/vp8cx_set_ref.c

@@ -138,9 +138,9 @@

     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 @@

   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)) {

--- a/examples/vpx_temporal_svc_encoder.c

+++ b/examples/vpx_temporal_svc_encoder.c

@@ -474,7 +474,7 @@

   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);

@@ -496,7 +496,7 @@

   }

   // 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;

@@ -574,7 +574,7 @@

   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) {

--- a/tools_common.h

+++ b/tools_common.h

@@ -120,7 +120,7 @@

 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();

--- a/vpxdec.c

+++ b/vpxdec.c

@@ -166,7 +166,7 @@

   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 @@

     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 @@

   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;

--- a/vpxenc.c

+++ b/vpxenc.c

@@ -426,7 +426,7 @@

   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 @@

     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 @@

   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 @@

   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 @@

 #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

 }