libvpx: Pull from upstream

source/libvpx/vpx/src/svc_encodeframe.c

 /*
  *  Copyright (c) 2013 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 77 matching lines @@
 
 // One encoded frame layer
 struct LayerData {
   void *buf;    // compressed data buffer
   size_t size;  // length of compressed data
   struct LayerData *next;
 };
 
 // create LayerData from encoder output
 static struct LayerData *ld_create(void *buf, size_t size) {
-  struct LayerData *const layer_data = malloc(sizeof(*layer_data));
+  struct LayerData *const layer_data =
+      (struct LayerData *)malloc(sizeof(*layer_data));
   if (layer_data == NULL) {
     return NULL;
   }
   layer_data->buf = malloc(size);
   if (layer_data->buf == NULL) {
     free(layer_data);
     return NULL;
   }
   memcpy(layer_data->buf, buf, size);
   layer_data->size = size;
@@ skipping 85 matching lines @@
       *bufp++ = this_sz & 0xff;
       this_sz >>= 8;
     }
   }
   *bufp++ = marker;
 }
 
 static SvcInternal *get_svc_internal(SvcContext *svc_ctx) {
   if (svc_ctx == NULL) return NULL;
   if (svc_ctx->internal == NULL) {
-    SvcInternal *const si = malloc(sizeof(*si));
+    SvcInternal *const si = (SvcInternal *)malloc(sizeof(*si));
     if (si != NULL) {
       memset(si, 0, sizeof(*si));
     }
     svc_ctx->internal = si;
   }
-  return svc_ctx->internal;
+  return (SvcInternal *)svc_ctx->internal;
 }
 
 static const SvcInternal *get_const_svc_internal(const SvcContext *svc_ctx) {
   if (svc_ctx == NULL) return NULL;
-  return svc_ctx->internal;
+  return (const SvcInternal *)svc_ctx->internal;
 }
 
 static void svc_log_reset(SvcContext *svc_ctx) {
   SvcInternal *const si = (SvcInternal *)svc_ctx->internal;
   si->message_buffer[0] = '\0';
 }
 
 static int svc_log(SvcContext *svc_ctx, int level, const char *fmt, ...) {
   char buf[512];
   int retval = 0;
@@ skipping 39 matching lines @@
 }
 
 static vpx_codec_err_t parse_quantizer_values(SvcContext *svc_ctx,
                                               const char *quantizer_values) {
   char *input_string;
   char *token;
   const char *delim = ",";
   char *save_ptr;
   int found = 0;
   int i, q;
-  int res = VPX_CODEC_OK;
+  vpx_codec_err_t res = VPX_CODEC_OK;
   SvcInternal *const si = get_svc_internal(svc_ctx);
 
   if (quantizer_values == NULL || strlen(quantizer_values) == 0) {
     input_string = strdup(DEFAULT_QUANTIZER_VALUES);
   } else {
     input_string = strdup(quantizer_values);
   }
 
   token = strtok_r(input_string, delim, &save_ptr);
   for (i = 0; i < svc_ctx->spatial_layers; ++i) {
@@ skipping 29 matching lines @@
 
 static vpx_codec_err_t parse_scale_factors(SvcContext *svc_ctx,
                                            const char *scale_factors) {
   char *input_string;
   char *token;
   const char *delim = ",";
   char *save_ptr;
   int found = 0;
   int i;
   int64_t num, den;
-  int res = VPX_CODEC_OK;
+  vpx_codec_err_t res = VPX_CODEC_OK;
   SvcInternal *const si = get_svc_internal(svc_ctx);
 
   if (scale_factors == NULL || strlen(scale_factors) == 0) {
     input_string = strdup(DEFAULT_SCALE_FACTORS);
   } else {
     input_string = strdup(scale_factors);
   }
   token = strtok_r(input_string, delim, &save_ptr);
   for (i = 0; i < svc_ctx->spatial_layers; ++i) {
     num = den = 0;
@@ skipping 38 matching lines @@
  * Format: encoding-mode=<svc_mode>,layers=<layer_count>
  *         scale-factors=<n1>/<d1>,<n2>/<d2>,...
  *         quantizers=<q1>,<q2>,...
  * svc_mode = [i|ip|alt_ip|gf]
  */
 static vpx_codec_err_t parse_options(SvcContext *svc_ctx, const char *options) {
   char *input_string;
   char *option_name;
   char *option_value;
   char *input_ptr;
-  int res = VPX_CODEC_OK;
+  vpx_codec_err_t res = VPX_CODEC_OK;
 
   if (options == NULL) return VPX_CODEC_OK;
   input_string = strdup(options);
 
   // parse option name
   option_name = strtok_r(input_string, "=", &input_ptr);
   while (option_name != NULL) {
     // parse option value
     option_value = strtok_r(NULL, " ", &input_ptr);
     if (option_value == NULL) {
@@ skipping 97 matching lines @@
 
   res = parse_scale_factors(svc_ctx, si->scale_factors);
   if (res != VPX_CODEC_OK) return res;
 
   // parse aggregate command line options
   res = parse_options(svc_ctx, si->options);
   if (res != VPX_CODEC_OK) return res;
 
   // modify encoder configuration
   enc_cfg->ss_number_layers = si->layers;
+  enc_cfg->ts_number_layers = 1;  // Temporal layers not used in this encoder.
   enc_cfg->kf_mode = VPX_KF_DISABLED;
   enc_cfg->g_pass = VPX_RC_ONE_PASS;
   // Lag in frames not currently supported
   enc_cfg->g_lag_in_frames = 0;
 
   // TODO(ivanmaltz): determine if these values need to be set explicitly for
   // svc, or if the normal default/override mechanism can be used
   enc_cfg->rc_dropframe_thresh = 0;
   enc_cfg->rc_end_usage = VPX_CBR;
   enc_cfg->rc_resize_allowed = 0;
@@ skipping 172 matching lines @@
   return VPX_CODEC_OK;
 }
 
 static void set_svc_parameters(SvcContext *svc_ctx,
                                vpx_codec_ctx_t *codec_ctx) {
   int layer, layer_index;
   vpx_svc_parameters_t svc_params;
   SvcInternal *const si = get_svc_internal(svc_ctx);
 
   memset(&svc_params, 0, sizeof(svc_params));
-  svc_params.layer = si->layer;
+  svc_params.temporal_layer = 0;
+  svc_params.spatial_layer = si->layer;
   svc_params.flags = si->enc_frame_flags;
 
   layer = si->layer;
   if (svc_ctx->encoding_mode == ALT_INTER_LAYER_PREDICTION_IP &&
       si->frame_within_gop == 0) {
     // layers 1 & 3 don't exist in this mode, use the higher one
     if (layer == 0 || layer == 2) {
       layer += 1;
     }
   }
@@ skipping 105 matching lines @@
         case VPX_CODEC_CX_FRAME_PKT: {
           const uint32_t frame_pkt_size = (uint32_t)(cx_pkt->data.frame.sz);
           si->bytes_in_layer[si->layer] += frame_pkt_size;
           svc_log(svc_ctx, SVC_LOG_DEBUG,
                   "SVC frame: %d, layer: %d, size: %u\n",
                   si->encode_frame_count, si->layer, frame_pkt_size);
           layer_data =
               ld_create(cx_pkt->data.frame.buf, (size_t)frame_pkt_size);
           if (layer_data == NULL) {
             svc_log(svc_ctx, SVC_LOG_ERROR, "Error allocating LayerData\n");
-            return 0;
+            return VPX_CODEC_OK;
           }
           ld_list_add(&cx_layer_list, layer_data);
 
           // save layer size in superframe index
           superframe.sizes[superframe.count++] = frame_pkt_size;
           superframe.magnitude |= frame_pkt_size;
           break;
         }
         case VPX_CODEC_PSNR_PKT: {
           svc_log(svc_ctx, SVC_LOG_DEBUG,
@@ skipping 24 matching lines @@
   if (si->frame_size > si->buffer_size) {
     free(si->buffer);
     si->buffer = malloc(si->frame_size);
     if (si->buffer == NULL) {
       ld_list_free(cx_layer_list);
       return VPX_CODEC_MEM_ERROR;
     }
     si->buffer_size = si->frame_size;
   }
   // copy layer data into packet
-  ld_list_copy_to_buffer(cx_layer_list, si->buffer);
+  ld_list_copy_to_buffer(cx_layer_list, (uint8_t *)si->buffer);
 
   ld_list_free(cx_layer_list);
 
   svc_log(svc_ctx, SVC_LOG_DEBUG, "SVC frame: %d, kf: %d, size: %d, pts: %d\n",
           si->encode_frame_count, si->is_keyframe, (int)si->frame_size,
           (int)pts);
   ++si->frame_within_gop;
   ++si->encode_frame_count;
 
   return VPX_CODEC_OK;
@@ skipping 77 matching lines @@
   if (svc_ctx == NULL) return;
   // do not use get_svc_internal as it will unnecessarily allocate an
   // SvcInternal if it was not already allocated
   si = (SvcInternal *)svc_ctx->internal;
   if (si != NULL) {
     free(si->buffer);
     free(si);
     svc_ctx->internal = NULL;
   }
 }