Commit 2215d2f1 authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

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
parents 6d65cb15 a5da7dea
...@@ -1247,9 +1247,8 @@ void vp9_loop_filter_frame(YV12_BUFFER_CONFIG *frame, ...@@ -1247,9 +1247,8 @@ void vp9_loop_filter_frame(YV12_BUFFER_CONFIG *frame,
y_only); y_only);
} }
int vp9_loop_filter_worker(void *arg1, void *arg2) { int vp9_loop_filter_worker(LFWorkerData *const lf_data, void *unused) {
LFWorkerData *const lf_data = (LFWorkerData*)arg1; (void)unused;
(void)arg2;
vp9_loop_filter_rows(lf_data->frame_buffer, lf_data->cm, lf_data->planes, vp9_loop_filter_rows(lf_data->frame_buffer, lf_data->cm, lf_data->planes,
lf_data->start, lf_data->stop, lf_data->y_only); lf_data->start, lf_data->stop, lf_data->y_only);
return 1; return 1;
......
...@@ -129,8 +129,8 @@ typedef struct LoopFilterWorkerData { ...@@ -129,8 +129,8 @@ typedef struct LoopFilterWorkerData {
int num_lf_workers; int num_lf_workers;
} LFWorkerData; } LFWorkerData;
// Operates on the rows described by LFWorkerData passed as 'arg1'. // Operates on the rows described by 'lf_data'.
int vp9_loop_filter_worker(void *arg1, void *arg2); int vp9_loop_filter_worker(LFWorkerData *const lf_data, void *unused);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif
......
...@@ -960,9 +960,8 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi, ...@@ -960,9 +960,8 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi,
return vp9_reader_find_end(&tile_data->bit_reader); return vp9_reader_find_end(&tile_data->bit_reader);
} }
static int tile_worker_hook(void *arg1, void *arg2) { static int tile_worker_hook(TileWorkerData *const tile_data,
TileWorkerData *const tile_data = (TileWorkerData*)arg1; const TileInfo *const tile) {
const TileInfo *const tile = (TileInfo*)arg2;
int mi_row, mi_col; int mi_row, mi_col;
for (mi_row = tile->mi_row_start; mi_row < tile->mi_row_end; for (mi_row = tile->mi_row_start; mi_row < tile->mi_row_end;
......
...@@ -121,10 +121,10 @@ static void loop_filter_rows_mt(const YV12_BUFFER_CONFIG *const frame_buffer, ...@@ -121,10 +121,10 @@ static void loop_filter_rows_mt(const YV12_BUFFER_CONFIG *const frame_buffer,
} }
// Row-based multi-threaded loopfilter hook // Row-based multi-threaded loopfilter hook
static int loop_filter_row_worker(void *arg1, void *arg2) { static int loop_filter_row_worker(TileWorkerData *const tile_data,
TileWorkerData *const tile_data = (TileWorkerData*)arg1; void *unused) {
LFWorkerData *const lf_data = &tile_data->lfdata; 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, 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->start, lf_data->stop, lf_data->y_only,
lf_data->lf_sync, lf_data->num_lf_workers); lf_data->lf_sync, lf_data->num_lf_workers);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment