From 04d2e574252ef017dab722e56393eadab1236060 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Wed, 1 Jul 2015 16:32:48 -0700 Subject: Use vpx prefix for codec independent threading functions Replace vp9_ prefix with vpx_ for common multi-threading functions. Change-Id: I941a5ead9bfe8213fdad345511d2061b07797b55 --- vp9/decoder/vp9_decodeframe.c | 18 +++++++++--------- vp9/decoder/vp9_decoder.c | 14 +++++++------- vp9/decoder/vp9_decoder.h | 6 +++--- vp9/decoder/vp9_dthread.c | 16 ++++++++-------- vp9/decoder/vp9_dthread.h | 12 ++++++------ 5 files changed, 33 insertions(+), 33 deletions(-) (limited to 'vp9/decoder') diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 4302d825f..51e3e45d3 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1259,7 +1259,7 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi, const uint8_t *data, const uint8_t *data_end) { VP9_COMMON *const cm = &pbi->common; - const VP9WorkerInterface *const winterface = vp9_get_worker_interface(); + const VPxWorkerInterface *const winterface = vpx_get_worker_interface(); const int aligned_cols = mi_cols_aligned_to_sb(cm->mi_cols); const int tile_cols = 1 << cm->log2_tile_cols; const int tile_rows = 1 << cm->log2_tile_rows; @@ -1272,7 +1272,7 @@ static const uint8_t *decode_tiles(VP9Decoder *pbi, pbi->lf_worker.data1 == NULL) { CHECK_MEM_ERROR(cm, pbi->lf_worker.data1, vpx_memalign(32, sizeof(LFWorkerData))); - pbi->lf_worker.hook = (VP9WorkerHook)vp9_loop_filter_worker; + pbi->lf_worker.hook = (VPxWorkerHook)vp9_loop_filter_worker; if (pbi->max_threads > 1 && !winterface->reset(&pbi->lf_worker)) { vpx_internal_error(&cm->error, VPX_CODEC_ERROR, "Loop filter thread creation failed"); @@ -1434,7 +1434,7 @@ static const uint8_t *decode_tiles_mt(VP9Decoder *pbi, const uint8_t *data, const uint8_t *data_end) { VP9_COMMON *const cm = &pbi->common; - const VP9WorkerInterface *const winterface = vp9_get_worker_interface(); + const VPxWorkerInterface *const winterface = vpx_get_worker_interface(); const uint8_t *bit_reader_end = NULL; const int aligned_mi_cols = mi_cols_aligned_to_sb(cm->mi_cols); const int tile_cols = 1 << cm->log2_tile_cols; @@ -1464,7 +1464,7 @@ static const uint8_t *decode_tiles_mt(VP9Decoder *pbi, CHECK_MEM_ERROR(cm, pbi->tile_worker_info, vpx_malloc(num_threads * sizeof(*pbi->tile_worker_info))); for (i = 0; i < num_threads; ++i) { - VP9Worker *const worker = &pbi->tile_workers[i]; + VPxWorker *const worker = &pbi->tile_workers[i]; ++pbi->num_tile_workers; winterface->init(worker); @@ -1477,9 +1477,9 @@ static const uint8_t *decode_tiles_mt(VP9Decoder *pbi, // Reset tile decoding hook for (n = 0; n < num_workers; ++n) { - VP9Worker *const worker = &pbi->tile_workers[n]; + VPxWorker *const worker = &pbi->tile_workers[n]; winterface->sync(worker); - worker->hook = (VP9WorkerHook)tile_worker_hook; + worker->hook = (VPxWorkerHook)tile_worker_hook; worker->data1 = &pbi->tile_worker_data[n]; worker->data2 = &pbi->tile_worker_info[n]; } @@ -1529,7 +1529,7 @@ static const uint8_t *decode_tiles_mt(VP9Decoder *pbi, while (n < tile_cols) { int i; for (i = 0; i < num_workers && n < tile_cols; ++i) { - VP9Worker *const worker = &pbi->tile_workers[i]; + VPxWorker *const worker = &pbi->tile_workers[i]; TileWorkerData *const tile_data = (TileWorkerData*)worker->data1; TileInfo *const tile = (TileInfo*)worker->data2; TileBuffer *const buf = &tile_buffers[0][n]; @@ -1561,7 +1561,7 @@ static const uint8_t *decode_tiles_mt(VP9Decoder *pbi, } for (; i > 0; --i) { - VP9Worker *const worker = &pbi->tile_workers[i - 1]; + VPxWorker *const worker = &pbi->tile_workers[i - 1]; // TODO(jzern): The tile may have specific error data associated with // its vpx_internal_error_info which could be propagated to the main info // in cm. Additionally once the threads have been synced and an error is @@ -2020,7 +2020,7 @@ void vp9_decode_frame(VP9Decoder *pbi, // If encoded in frame parallel mode, frame context is ready after decoding // the frame header. if (pbi->frame_parallel_decode && cm->frame_parallel_decoding_mode) { - VP9Worker *const worker = pbi->frame_worker_owner; + VPxWorker *const worker = pbi->frame_worker_owner; FrameWorkerData *const frame_worker_data = worker->data1; if (cm->refresh_frame_context) { context_updated = 1; diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c index 5f5e201d8..cbb3266d3 100644 --- a/vp9/decoder/vp9_decoder.c +++ b/vp9/decoder/vp9_decoder.c @@ -118,7 +118,7 @@ VP9Decoder *vp9_decoder_create(BufferPool *const pool) { cm->error.setjmp = 0; - vp9_get_worker_interface()->init(&pbi->lf_worker); + vpx_get_worker_interface()->init(&pbi->lf_worker); return pbi; } @@ -126,12 +126,12 @@ VP9Decoder *vp9_decoder_create(BufferPool *const pool) { void vp9_decoder_remove(VP9Decoder *pbi) { int i; - vp9_get_worker_interface()->end(&pbi->lf_worker); + vpx_get_worker_interface()->end(&pbi->lf_worker); vpx_free(pbi->lf_worker.data1); vpx_free(pbi->tile_data); for (i = 0; i < pbi->num_tile_workers; ++i) { - VP9Worker *const worker = &pbi->tile_workers[i]; - vp9_get_worker_interface()->end(worker); + VPxWorker *const worker = &pbi->tile_workers[i]; + vpx_get_worker_interface()->end(worker); } vpx_free(pbi->tile_worker_data); vpx_free(pbi->tile_worker_info); @@ -311,7 +311,7 @@ int vp9_receive_compressed_data(VP9Decoder *pbi, pbi->hold_ref_buf = 0; if (pbi->frame_parallel_decode) { - VP9Worker *const worker = pbi->frame_worker_owner; + VPxWorker *const worker = pbi->frame_worker_owner; vp9_frameworker_lock_stats(worker); frame_bufs[cm->new_fb_idx].frame_worker_owner = worker; // Reset decoding progress. @@ -325,7 +325,7 @@ int vp9_receive_compressed_data(VP9Decoder *pbi, if (setjmp(cm->error.jmp)) { - const VP9WorkerInterface *const winterface = vp9_get_worker_interface(); + const VPxWorkerInterface *const winterface = vpx_get_worker_interface(); int i; cm->error.setjmp = 0; @@ -387,7 +387,7 @@ int vp9_receive_compressed_data(VP9Decoder *pbi, if (pbi->frame_parallel_decode) { // Need to lock the mutex here as another thread may // be accessing this buffer. - VP9Worker *const worker = pbi->frame_worker_owner; + VPxWorker *const worker = pbi->frame_worker_owner; FrameWorkerData *const frame_worker_data = worker->data1; vp9_frameworker_lock_stats(worker); diff --git a/vp9/decoder/vp9_decoder.h b/vp9/decoder/vp9_decoder.h index 8a6590899..50c03c18e 100644 --- a/vp9/decoder/vp9_decoder.h +++ b/vp9/decoder/vp9_decoder.h @@ -57,9 +57,9 @@ typedef struct VP9Decoder { // the same. RefCntBuffer *cur_buf; // Current decoding frame buffer. - VP9Worker *frame_worker_owner; // frame_worker that owns this pbi. - VP9Worker lf_worker; - VP9Worker *tile_workers; + VPxWorker *frame_worker_owner; // frame_worker that owns this pbi. + VPxWorker lf_worker; + VPxWorker *tile_workers; TileWorkerData *tile_worker_data; TileInfo *tile_worker_info; int num_tile_workers; diff --git a/vp9/decoder/vp9_dthread.c b/vp9/decoder/vp9_dthread.c index 96a63bd9e..14a71448f 100644 --- a/vp9/decoder/vp9_dthread.c +++ b/vp9/decoder/vp9_dthread.c @@ -17,7 +17,7 @@ // #define DEBUG_THREAD // TODO(hkuang): Clean up all the #ifdef in this file. -void vp9_frameworker_lock_stats(VP9Worker *const worker) { +void vp9_frameworker_lock_stats(VPxWorker *const worker) { #if CONFIG_MULTITHREAD FrameWorkerData *const worker_data = worker->data1; pthread_mutex_lock(&worker_data->stats_mutex); @@ -26,7 +26,7 @@ void vp9_frameworker_lock_stats(VP9Worker *const worker) { #endif } -void vp9_frameworker_unlock_stats(VP9Worker *const worker) { +void vp9_frameworker_unlock_stats(VPxWorker *const worker) { #if CONFIG_MULTITHREAD FrameWorkerData *const worker_data = worker->data1; pthread_mutex_unlock(&worker_data->stats_mutex); @@ -35,7 +35,7 @@ void vp9_frameworker_unlock_stats(VP9Worker *const worker) { #endif } -void vp9_frameworker_signal_stats(VP9Worker *const worker) { +void vp9_frameworker_signal_stats(VPxWorker *const worker) { #if CONFIG_MULTITHREAD FrameWorkerData *const worker_data = worker->data1; @@ -59,7 +59,7 @@ void vp9_frameworker_signal_stats(VP9Worker *const worker) { #endif // TODO(hkuang): Remove worker parameter as it is only used in debug code. -void vp9_frameworker_wait(VP9Worker *const worker, RefCntBuffer *const ref_buf, +void vp9_frameworker_wait(VPxWorker *const worker, RefCntBuffer *const ref_buf, int row) { #if CONFIG_MULTITHREAD if (!ref_buf) @@ -74,7 +74,7 @@ void vp9_frameworker_wait(VP9Worker *const worker, RefCntBuffer *const ref_buf, { // Find the worker thread that owns the reference frame. If the reference // frame has been fully decoded, it may not have owner. - VP9Worker *const ref_worker = ref_buf->frame_worker_owner; + VPxWorker *const ref_worker = ref_buf->frame_worker_owner; FrameWorkerData *const ref_worker_data = (FrameWorkerData *)ref_worker->data1; const VP9Decoder *const pbi = ref_worker_data->pbi; @@ -114,7 +114,7 @@ void vp9_frameworker_wait(VP9Worker *const worker, RefCntBuffer *const ref_buf, void vp9_frameworker_broadcast(RefCntBuffer *const buf, int row) { #if CONFIG_MULTITHREAD - VP9Worker *worker = buf->frame_worker_owner; + VPxWorker *worker = buf->frame_worker_owner; #ifdef DEBUG_THREAD { @@ -134,8 +134,8 @@ void vp9_frameworker_broadcast(RefCntBuffer *const buf, int row) { #endif // CONFIG_MULTITHREAD } -void vp9_frameworker_copy_context(VP9Worker *const dst_worker, - VP9Worker *const src_worker) { +void vp9_frameworker_copy_context(VPxWorker *const dst_worker, + VPxWorker *const src_worker) { #if CONFIG_MULTITHREAD FrameWorkerData *const src_worker_data = (FrameWorkerData *)src_worker->data1; FrameWorkerData *const dst_worker_data = (FrameWorkerData *)dst_worker->data1; diff --git a/vp9/decoder/vp9_dthread.h b/vp9/decoder/vp9_dthread.h index 80445816e..862880167 100644 --- a/vp9/decoder/vp9_dthread.h +++ b/vp9/decoder/vp9_dthread.h @@ -44,15 +44,15 @@ typedef struct FrameWorkerData { int frame_decoded; // Finished decoding current frame. } FrameWorkerData; -void vp9_frameworker_lock_stats(VP9Worker *const worker); -void vp9_frameworker_unlock_stats(VP9Worker *const worker); -void vp9_frameworker_signal_stats(VP9Worker *const worker); +void vp9_frameworker_lock_stats(VPxWorker *const worker); +void vp9_frameworker_unlock_stats(VPxWorker *const worker); +void vp9_frameworker_signal_stats(VPxWorker *const worker); // Wait until ref_buf has been decoded to row in real pixel unit. // Note: worker may already finish decoding ref_buf and release it in order to // start decoding next frame. So need to check whether worker is still decoding // ref_buf. -void vp9_frameworker_wait(VP9Worker *const worker, RefCntBuffer *const ref_buf, +void vp9_frameworker_wait(VPxWorker *const worker, RefCntBuffer *const ref_buf, int row); // FrameWorker broadcasts its decoding progress so other workers that are @@ -60,7 +60,7 @@ void vp9_frameworker_wait(VP9Worker *const worker, RefCntBuffer *const ref_buf, void vp9_frameworker_broadcast(RefCntBuffer *const buf, int row); // Copy necessary decoding context from src worker to dst worker. -void vp9_frameworker_copy_context(VP9Worker *const dst_worker, - VP9Worker *const src_worker); +void vp9_frameworker_copy_context(VPxWorker *const dst_worker, + VPxWorker *const src_worker); #endif // VP9_DECODER_VP9_DTHREAD_H_ -- cgit v1.2.3