Merge changes If8887e1d,I36bfc9c8,I3d1e6c42 * changes: vp9_dthread: simplify loop_filter_row_worker signature simplify vp9_loop_filter_worker signature vp9_decodeframe: simplify tile_work_hook signature
diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c index 3b39d42..a6862e4 100644 --- a/vp9/common/vp9_loopfilter.c +++ b/vp9/common/vp9_loopfilter.c
@@ -1247,9 +1247,8 @@ y_only); } -int vp9_loop_filter_worker(void *arg1, void *arg2) { - LFWorkerData *const lf_data = (LFWorkerData*)arg1; - (void)arg2; +int vp9_loop_filter_worker(LFWorkerData *const lf_data, void *unused) { + (void)unused; vp9_loop_filter_rows(lf_data->frame_buffer, lf_data->cm, lf_data->planes, lf_data->start, lf_data->stop, lf_data->y_only); return 1;
diff --git a/vp9/common/vp9_loopfilter.h b/vp9/common/vp9_loopfilter.h index 6fa2773..0f3838b 100644 --- a/vp9/common/vp9_loopfilter.h +++ b/vp9/common/vp9_loopfilter.h
@@ -129,8 +129,8 @@ int num_lf_workers; } LFWorkerData; -// Operates on the rows described by LFWorkerData passed as 'arg1'. -int vp9_loop_filter_worker(void *arg1, void *arg2); +// Operates on the rows described by 'lf_data'. +int vp9_loop_filter_worker(LFWorkerData *const lf_data, void *unused); #ifdef __cplusplus } // extern "C" #endif
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index aecd906..7b1ed5a 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c
@@ -960,9 +960,8 @@ return vp9_reader_find_end(&tile_data->bit_reader); } -static int tile_worker_hook(void *arg1, void *arg2) { - TileWorkerData *const tile_data = (TileWorkerData*)arg1; - const TileInfo *const tile = (TileInfo*)arg2; +static int tile_worker_hook(TileWorkerData *const tile_data, + const TileInfo *const tile) { int mi_row, mi_col; for (mi_row = tile->mi_row_start; mi_row < tile->mi_row_end;
diff --git a/vp9/decoder/vp9_dthread.c b/vp9/decoder/vp9_dthread.c index 1572aa4..6635880 100644 --- a/vp9/decoder/vp9_dthread.c +++ b/vp9/decoder/vp9_dthread.c
@@ -121,10 +121,10 @@ } // Row-based multi-threaded loopfilter hook -static int loop_filter_row_worker(void *arg1, void *arg2) { - TileWorkerData *const tile_data = (TileWorkerData*)arg1; +static int loop_filter_row_worker(TileWorkerData *const tile_data, + void *unused) { LFWorkerData *const lf_data = &tile_data->lfdata; - (void) arg2; + (void)unused; loop_filter_rows_mt(lf_data->frame_buffer, lf_data->cm, lf_data->planes, lf_data->start, lf_data->stop, lf_data->y_only, lf_data->lf_sync, lf_data->num_lf_workers);