generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "vp9_lookahead_push(): remove unused parameters"

Browse Source
This commit is contained in:
Yaowu Xu
2014-03-03 08:36:06 -08:00
committed by Gerrit Code Review
parent 32705df409 dac3d0cebd
commit a9288e297f
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vp9/encoder/vp9_lookahead.c
View File

@@ -88,8 +88,7 @@ struct lookahead_ctx * vp9_lookahead_init(unsigned int width,
#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;

3
vp9/encoder/vp9_lookahead.h
View File

@@ -63,8 +63,7 @@ void vp9_lookahead_destroy(struct lookahead_ctx *ctx);
* \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

4
vp9/encoder/vp9_onyx_if.c
View File

@@ -3459,8 +3459,8 @@ int vp9_receive_raw_frame(VP9_PTR ptr, unsigned int frame_flags,
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);