shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9_lookahead_push(): remove unused parameters"

--- a/vp9/encoder/vp9_lookahead.c

+++ b/vp9/encoder/vp9_lookahead.c

@@ -88,8 +88,7 @@

 #define USE_PARTIAL_COPY 0

 int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG   *src,

-                       int64_t ts_start, int64_t ts_end, unsigned int flags,

-                       unsigned char *active_map) {

+                       int64_t ts_start, int64_t ts_end, unsigned int flags) {

   struct lookahead_entry *buf;

 #if USE_PARTIAL_COPY

   int row, col, active_end;

--- a/vp9/encoder/vp9_lookahead.h

+++ b/vp9/encoder/vp9_lookahead.h

@@ -63,8 +63,7 @@

  * \param[in] active_map  Map that specifies which macroblock is active

  */

 int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src,

-                       int64_t ts_start, int64_t ts_end, unsigned int flags,

-                       unsigned char *active_map);

+                       int64_t ts_start, int64_t ts_end, unsigned int flags);

 /**\brief Get the next source buffer to encode

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -3459,8 +3459,8 @@

   check_initial_width(cpi, subsampling_x, subsampling_y);

   vpx_usec_timer_start(&timer);

-  if (vp9_lookahead_push(cpi->lookahead, sd, time_stamp, end_time, frame_flags,

-                         cpi->active_map_enabled ? cpi->active_map : NULL))

+  if (vp9_lookahead_push(cpi->lookahead,

+                         sd, time_stamp, end_time, frame_flags))

     res = -1;

   vpx_usec_timer_mark(&timer);

   cpi->time_receive_data += vpx_usec_timer_elapsed(&timer);