ref: 94ec37097ed75116f04b59f451509e135d447a2b
parent: 00238b7c01b599627af12cfb908137013b544590
parent: c47fd31b5a50c33c3ef2152d3c1cf1d8a5fe8810
author: James Zern <jzern@google.com>
date: Thu Aug 30 23:22:42 EDT 2018
Merge "cosmetics,lf threading: normalize struct member names"
--- a/vp9/common/vp9_thread_common.c
+++ b/vp9/common/vp9_thread_common.c
@@ -38,11 +38,11 @@
const int nsync = lf_sync->sync_range;
if (r && !(c & (nsync - 1))) {- pthread_mutex_t *const mutex = &lf_sync->mutex_[r - 1];
+ pthread_mutex_t *const mutex = &lf_sync->mutex[r - 1];
mutex_lock(mutex);
while (c > lf_sync->cur_sb_col[r - 1] - nsync) {- pthread_cond_wait(&lf_sync->cond_[r - 1], mutex);
+ pthread_cond_wait(&lf_sync->cond[r - 1], mutex);
}
pthread_mutex_unlock(mutex);
}
@@ -69,12 +69,12 @@
}
if (sig) {- mutex_lock(&lf_sync->mutex_[r]);
+ mutex_lock(&lf_sync->mutex[r]);
lf_sync->cur_sb_col[r] = cur;
- pthread_cond_signal(&lf_sync->cond_[r]);
- pthread_mutex_unlock(&lf_sync->mutex_[r]);
+ pthread_cond_signal(&lf_sync->cond[r]);
+ pthread_mutex_unlock(&lf_sync->mutex[r]);
}
#else
(void)lf_sync;
@@ -251,19 +251,19 @@
{int i;
- CHECK_MEM_ERROR(cm, lf_sync->mutex_,
- vpx_malloc(sizeof(*lf_sync->mutex_) * rows));
- if (lf_sync->mutex_) {+ CHECK_MEM_ERROR(cm, lf_sync->mutex,
+ vpx_malloc(sizeof(*lf_sync->mutex) * rows));
+ if (lf_sync->mutex) { for (i = 0; i < rows; ++i) {- pthread_mutex_init(&lf_sync->mutex_[i], NULL);
+ pthread_mutex_init(&lf_sync->mutex[i], NULL);
}
}
- CHECK_MEM_ERROR(cm, lf_sync->cond_,
- vpx_malloc(sizeof(*lf_sync->cond_) * rows));
- if (lf_sync->cond_) {+ CHECK_MEM_ERROR(cm, lf_sync->cond,
+ vpx_malloc(sizeof(*lf_sync->cond) * rows));
+ if (lf_sync->cond) { for (i = 0; i < rows; ++i) {- pthread_cond_init(&lf_sync->cond_[i], NULL);
+ pthread_cond_init(&lf_sync->cond[i], NULL);
}
}
}
@@ -286,17 +286,17 @@
#if CONFIG_MULTITHREAD
int i;
- if (lf_sync->mutex_ != NULL) {+ if (lf_sync->mutex != NULL) { for (i = 0; i < lf_sync->rows; ++i) {- pthread_mutex_destroy(&lf_sync->mutex_[i]);
+ pthread_mutex_destroy(&lf_sync->mutex[i]);
}
- vpx_free(lf_sync->mutex_);
+ vpx_free(lf_sync->mutex);
}
- if (lf_sync->cond_ != NULL) {+ if (lf_sync->cond != NULL) { for (i = 0; i < lf_sync->rows; ++i) {- pthread_cond_destroy(&lf_sync->cond_[i]);
+ pthread_cond_destroy(&lf_sync->cond[i]);
}
- vpx_free(lf_sync->cond_);
+ vpx_free(lf_sync->cond);
}
#endif // CONFIG_MULTITHREAD
vpx_free(lf_sync->lfdata);
--- a/vp9/common/vp9_thread_common.h
+++ b/vp9/common/vp9_thread_common.h
@@ -24,8 +24,8 @@
// Loopfilter row synchronization
typedef struct VP9LfSyncData {#if CONFIG_MULTITHREAD
- pthread_mutex_t *mutex_;
- pthread_cond_t *cond_;
+ pthread_mutex_t *mutex;
+ pthread_cond_t *cond;
#endif
// Allocate memory to store the loop-filtered superblock index in each row.
int *cur_sb_col;
--- a/vp9/encoder/vp9_ethread.c
+++ b/vp9/encoder/vp9_ethread.c
@@ -270,19 +270,19 @@
{int i;
- CHECK_MEM_ERROR(cm, row_mt_sync->mutex_,
- vpx_malloc(sizeof(*row_mt_sync->mutex_) * rows));
- if (row_mt_sync->mutex_) {+ CHECK_MEM_ERROR(cm, row_mt_sync->mutex,
+ vpx_malloc(sizeof(*row_mt_sync->mutex) * rows));
+ if (row_mt_sync->mutex) { for (i = 0; i < rows; ++i) {- pthread_mutex_init(&row_mt_sync->mutex_[i], NULL);
+ pthread_mutex_init(&row_mt_sync->mutex[i], NULL);
}
}
- CHECK_MEM_ERROR(cm, row_mt_sync->cond_,
- vpx_malloc(sizeof(*row_mt_sync->cond_) * rows));
- if (row_mt_sync->cond_) {+ CHECK_MEM_ERROR(cm, row_mt_sync->cond,
+ vpx_malloc(sizeof(*row_mt_sync->cond) * rows));
+ if (row_mt_sync->cond) { for (i = 0; i < rows; ++i) {- pthread_cond_init(&row_mt_sync->cond_[i], NULL);
+ pthread_cond_init(&row_mt_sync->cond[i], NULL);
}
}
}
@@ -301,17 +301,17 @@
#if CONFIG_MULTITHREAD
int i;
- if (row_mt_sync->mutex_ != NULL) {+ if (row_mt_sync->mutex != NULL) { for (i = 0; i < row_mt_sync->rows; ++i) {- pthread_mutex_destroy(&row_mt_sync->mutex_[i]);
+ pthread_mutex_destroy(&row_mt_sync->mutex[i]);
}
- vpx_free(row_mt_sync->mutex_);
+ vpx_free(row_mt_sync->mutex);
}
- if (row_mt_sync->cond_ != NULL) {+ if (row_mt_sync->cond != NULL) { for (i = 0; i < row_mt_sync->rows; ++i) {- pthread_cond_destroy(&row_mt_sync->cond_[i]);
+ pthread_cond_destroy(&row_mt_sync->cond[i]);
}
- vpx_free(row_mt_sync->cond_);
+ vpx_free(row_mt_sync->cond);
}
#endif // CONFIG_MULTITHREAD
vpx_free(row_mt_sync->cur_col);
@@ -327,11 +327,11 @@
const int nsync = row_mt_sync->sync_range;
if (r && !(c & (nsync - 1))) {- pthread_mutex_t *const mutex = &row_mt_sync->mutex_[r - 1];
+ pthread_mutex_t *const mutex = &row_mt_sync->mutex[r - 1];
pthread_mutex_lock(mutex);
while (c > row_mt_sync->cur_col[r - 1] - nsync + 1) {- pthread_cond_wait(&row_mt_sync->cond_[r - 1], mutex);
+ pthread_cond_wait(&row_mt_sync->cond[r - 1], mutex);
}
pthread_mutex_unlock(mutex);
}
@@ -365,12 +365,12 @@
}
if (sig) {- pthread_mutex_lock(&row_mt_sync->mutex_[r]);
+ pthread_mutex_lock(&row_mt_sync->mutex[r]);
row_mt_sync->cur_col[r] = cur;
- pthread_cond_signal(&row_mt_sync->cond_[r]);
- pthread_mutex_unlock(&row_mt_sync->mutex_[r]);
+ pthread_cond_signal(&row_mt_sync->cond[r]);
+ pthread_mutex_unlock(&row_mt_sync->mutex[r]);
}
#else
(void)row_mt_sync;
--- a/vp9/encoder/vp9_ethread.h
+++ b/vp9/encoder/vp9_ethread.h
@@ -33,8 +33,8 @@
// Encoder row synchronization
typedef struct VP9RowMTSyncData {#if CONFIG_MULTITHREAD
- pthread_mutex_t *mutex_;
- pthread_cond_t *cond_;
+ pthread_mutex_t *mutex;
+ pthread_cond_t *cond;
#endif
// Allocate memory to store the sb/mb block index in each row.
int *cur_col;