2013-12-28 00:25:54 +01:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2014 The WebM project authors. All Rights Reserved.
|
|
|
|
*
|
|
|
|
* Use of this source code is governed by a BSD-style license
|
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
|
|
|
* in the file PATENTS. All contributing project authors may
|
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "./vpx_config.h"
|
2014-03-03 23:34:39 +01:00
|
|
|
#include "vpx_mem/vpx_mem.h"
|
2015-02-06 20:37:45 +01:00
|
|
|
#include "vp9/common/vp9_entropymode.h"
|
2015-02-06 19:03:31 +01:00
|
|
|
#include "vp9/common/vp9_thread_common.h"
|
2013-12-28 00:25:54 +01:00
|
|
|
#include "vp9/common/vp9_reconinter.h"
|
2015-03-20 22:51:59 +01:00
|
|
|
#include "vp9/common/vp9_loopfilter.h"
|
2014-03-03 23:34:39 +01:00
|
|
|
|
2013-12-28 00:25:54 +01:00
|
|
|
#if CONFIG_MULTITHREAD
|
|
|
|
static INLINE void mutex_lock(pthread_mutex_t *const mutex) {
|
|
|
|
const int kMaxTryLocks = 4000;
|
|
|
|
int locked = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < kMaxTryLocks; ++i) {
|
|
|
|
if (!pthread_mutex_trylock(mutex)) {
|
|
|
|
locked = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!locked)
|
|
|
|
pthread_mutex_lock(mutex);
|
|
|
|
}
|
|
|
|
#endif // CONFIG_MULTITHREAD
|
|
|
|
|
|
|
|
static INLINE void sync_read(VP9LfSync *const lf_sync, int r, int c) {
|
|
|
|
#if CONFIG_MULTITHREAD
|
|
|
|
const int nsync = lf_sync->sync_range;
|
|
|
|
|
|
|
|
if (r && !(c & (nsync - 1))) {
|
2014-04-11 01:17:49 +02:00
|
|
|
pthread_mutex_t *const mutex = &lf_sync->mutex_[r - 1];
|
|
|
|
mutex_lock(mutex);
|
2013-12-28 00:25:54 +01:00
|
|
|
|
|
|
|
while (c > lf_sync->cur_sb_col[r - 1] - nsync) {
|
2014-04-11 01:17:49 +02:00
|
|
|
pthread_cond_wait(&lf_sync->cond_[r - 1], mutex);
|
2013-12-28 00:25:54 +01:00
|
|
|
}
|
2014-04-11 01:17:49 +02:00
|
|
|
pthread_mutex_unlock(mutex);
|
2013-12-28 00:25:54 +01:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
(void)lf_sync;
|
|
|
|
(void)r;
|
|
|
|
(void)c;
|
|
|
|
#endif // CONFIG_MULTITHREAD
|
|
|
|
}
|
|
|
|
|
|
|
|
static INLINE void sync_write(VP9LfSync *const lf_sync, int r, int c,
|
|
|
|
const int sb_cols) {
|
|
|
|
#if CONFIG_MULTITHREAD
|
|
|
|
const int nsync = lf_sync->sync_range;
|
|
|
|
int cur;
|
|
|
|
// Only signal when there are enough filtered SB for next row to run.
|
|
|
|
int sig = 1;
|
|
|
|
|
|
|
|
if (c < sb_cols - 1) {
|
|
|
|
cur = c;
|
|
|
|
if (c % nsync)
|
|
|
|
sig = 0;
|
|
|
|
} else {
|
|
|
|
cur = sb_cols + nsync;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sig) {
|
|
|
|
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]);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
(void)lf_sync;
|
|
|
|
(void)r;
|
|
|
|
(void)c;
|
|
|
|
(void)sb_cols;
|
|
|
|
#endif // CONFIG_MULTITHREAD
|
|
|
|
}
|
|
|
|
|
|
|
|
// Implement row loopfiltering for each thread.
|
2015-01-06 23:14:26 +01:00
|
|
|
static INLINE
|
|
|
|
void thread_loop_filter_rows(const YV12_BUFFER_CONFIG *const frame_buffer,
|
|
|
|
VP9_COMMON *const cm,
|
|
|
|
struct macroblockd_plane planes[MAX_MB_PLANE],
|
|
|
|
int start, int stop, int y_only,
|
|
|
|
VP9LfSync *const lf_sync) {
|
2013-12-28 00:25:54 +01:00
|
|
|
const int num_planes = y_only ? 1 : MAX_MB_PLANE;
|
|
|
|
const int sb_cols = mi_cols_aligned_to_sb(cm->mi_cols) >> MI_BLOCK_SIZE_LOG2;
|
2015-01-06 23:14:26 +01:00
|
|
|
int mi_row, mi_col;
|
2015-03-20 22:51:59 +01:00
|
|
|
enum lf_path path;
|
|
|
|
if (y_only)
|
|
|
|
path = LF_PATH_444;
|
|
|
|
else if (planes[1].subsampling_y == 1 && planes[1].subsampling_x == 1)
|
|
|
|
path = LF_PATH_420;
|
|
|
|
else if (planes[1].subsampling_y == 0 && planes[1].subsampling_x == 0)
|
|
|
|
path = LF_PATH_444;
|
|
|
|
else
|
|
|
|
path = LF_PATH_SLOW;
|
2013-12-28 00:25:54 +01:00
|
|
|
|
2015-01-06 23:14:26 +01:00
|
|
|
for (mi_row = start; mi_row < stop;
|
|
|
|
mi_row += lf_sync->num_workers * MI_BLOCK_SIZE) {
|
2015-04-21 14:36:58 +02:00
|
|
|
MODE_INFO **const mi = cm->mi_grid_visible + mi_row * cm->mi_stride;
|
2013-12-28 00:25:54 +01:00
|
|
|
|
2015-01-06 23:14:26 +01:00
|
|
|
for (mi_col = 0; mi_col < cm->mi_cols; mi_col += MI_BLOCK_SIZE) {
|
|
|
|
const int r = mi_row >> MI_BLOCK_SIZE_LOG2;
|
|
|
|
const int c = mi_col >> MI_BLOCK_SIZE_LOG2;
|
2014-04-11 01:17:49 +02:00
|
|
|
LOOP_FILTER_MASK lfm;
|
2013-12-28 00:25:54 +01:00
|
|
|
int plane;
|
|
|
|
|
|
|
|
sync_read(lf_sync, r, c);
|
|
|
|
|
2014-05-16 18:48:26 +02:00
|
|
|
vp9_setup_dst_planes(planes, frame_buffer, mi_row, mi_col);
|
2015-01-17 00:47:25 +01:00
|
|
|
|
|
|
|
// TODO(JBB): Make setup_mask work for non 420.
|
2015-03-20 22:51:59 +01:00
|
|
|
vp9_setup_mask(cm, mi_row, mi_col, mi + mi_col, cm->mi_stride,
|
|
|
|
&lfm);
|
|
|
|
|
|
|
|
vp9_filter_block_plane_ss00(cm, &planes[0], mi_row, &lfm);
|
|
|
|
for (plane = 1; plane < num_planes; ++plane) {
|
|
|
|
switch (path) {
|
|
|
|
case LF_PATH_420:
|
|
|
|
vp9_filter_block_plane_ss11(cm, &planes[plane], mi_row, &lfm);
|
|
|
|
break;
|
|
|
|
case LF_PATH_444:
|
|
|
|
vp9_filter_block_plane_ss00(cm, &planes[plane], mi_row, &lfm);
|
|
|
|
break;
|
|
|
|
case LF_PATH_SLOW:
|
|
|
|
vp9_filter_block_plane_non420(cm, &planes[plane], mi + mi_col,
|
|
|
|
mi_row, mi_col);
|
|
|
|
break;
|
|
|
|
}
|
2013-12-28 00:25:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
sync_write(lf_sync, r, c, sb_cols);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Row-based multi-threaded loopfilter hook
|
2014-08-31 22:16:37 +02:00
|
|
|
static int loop_filter_row_worker(VP9LfSync *const lf_sync,
|
|
|
|
LFWorkerData *const lf_data) {
|
2015-01-06 23:14:26 +01:00
|
|
|
thread_loop_filter_rows(lf_data->frame_buffer, lf_data->cm, lf_data->planes,
|
|
|
|
lf_data->start, lf_data->stop, lf_data->y_only,
|
|
|
|
lf_sync);
|
2013-12-28 00:25:54 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-01-06 23:14:26 +01:00
|
|
|
static void loop_filter_rows_mt(YV12_BUFFER_CONFIG *frame,
|
|
|
|
VP9_COMMON *cm,
|
|
|
|
struct macroblockd_plane planes[MAX_MB_PLANE],
|
|
|
|
int start, int stop, int y_only,
|
|
|
|
VP9Worker *workers, int nworkers,
|
|
|
|
VP9LfSync *lf_sync) {
|
2014-06-20 06:14:51 +02:00
|
|
|
const VP9WorkerInterface *const winterface = vp9_get_worker_interface();
|
2013-12-28 00:25:54 +01:00
|
|
|
// Number of superblock rows and cols
|
|
|
|
const int sb_rows = mi_cols_aligned_to_sb(cm->mi_rows) >> MI_BLOCK_SIZE_LOG2;
|
2015-01-06 23:14:26 +01:00
|
|
|
// Decoder may allocate more threads than number of tiles based on user's
|
|
|
|
// input.
|
2014-04-07 05:07:14 +02:00
|
|
|
const int tile_cols = 1 << cm->log2_tile_cols;
|
2014-08-31 21:46:19 +02:00
|
|
|
const int num_workers = MIN(nworkers, tile_cols);
|
2013-12-28 00:25:54 +01:00
|
|
|
int i;
|
|
|
|
|
2015-02-14 03:03:45 +01:00
|
|
|
if (!lf_sync->sync_range || sb_rows != lf_sync->rows ||
|
2014-08-31 22:16:37 +02:00
|
|
|
num_workers > lf_sync->num_workers) {
|
2014-08-29 02:11:31 +02:00
|
|
|
vp9_loop_filter_dealloc(lf_sync);
|
2014-08-31 22:16:37 +02:00
|
|
|
vp9_loop_filter_alloc(lf_sync, cm, sb_rows, cm->width, num_workers);
|
2013-12-28 00:25:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Initialize cur_sb_col to -1 for all SB rows.
|
2015-04-24 05:47:40 +02:00
|
|
|
memset(lf_sync->cur_sb_col, -1, sizeof(*lf_sync->cur_sb_col) * sb_rows);
|
2013-12-28 00:25:54 +01:00
|
|
|
|
|
|
|
// Set up loopfilter thread data.
|
2014-08-31 21:46:19 +02:00
|
|
|
// The decoder is capping num_workers because it has been observed that using
|
|
|
|
// more threads on the loopfilter than there are cores will hurt performance
|
|
|
|
// on Android. This is because the system will only schedule the tile decode
|
|
|
|
// workers on cores equal to the number of tile columns. Then if the decoder
|
|
|
|
// tries to use more threads for the loopfilter, it will hurt performance
|
|
|
|
// because of contention. If the multithreading code changes in the future
|
|
|
|
// then the number of workers used by the loopfilter should be revisited.
|
2014-04-07 05:07:14 +02:00
|
|
|
for (i = 0; i < num_workers; ++i) {
|
2014-08-31 21:46:19 +02:00
|
|
|
VP9Worker *const worker = &workers[i];
|
2014-08-31 22:16:37 +02:00
|
|
|
LFWorkerData *const lf_data = &lf_sync->lfdata[i];
|
2013-12-28 00:25:54 +01:00
|
|
|
|
|
|
|
worker->hook = (VP9WorkerHook)loop_filter_row_worker;
|
2014-08-31 22:16:37 +02:00
|
|
|
worker->data1 = lf_sync;
|
|
|
|
worker->data2 = lf_data;
|
2013-12-28 00:25:54 +01:00
|
|
|
|
|
|
|
// Loopfilter data
|
2013-12-26 19:15:56 +01:00
|
|
|
vp9_loop_filter_data_reset(lf_data, frame, cm, planes);
|
2015-01-06 23:14:26 +01:00
|
|
|
lf_data->start = start + i * MI_BLOCK_SIZE;
|
|
|
|
lf_data->stop = stop;
|
2014-08-31 21:46:19 +02:00
|
|
|
lf_data->y_only = y_only;
|
2013-12-28 00:25:54 +01:00
|
|
|
|
|
|
|
// Start loopfiltering
|
2014-04-07 05:07:14 +02:00
|
|
|
if (i == num_workers - 1) {
|
2014-06-20 06:14:51 +02:00
|
|
|
winterface->execute(worker);
|
2013-12-28 00:25:54 +01:00
|
|
|
} else {
|
2014-06-20 06:14:51 +02:00
|
|
|
winterface->launch(worker);
|
2013-12-28 00:25:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Wait till all rows are finished
|
2014-04-07 05:07:14 +02:00
|
|
|
for (i = 0; i < num_workers; ++i) {
|
2014-08-31 21:46:19 +02:00
|
|
|
winterface->sync(&workers[i]);
|
2013-12-28 00:25:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-06 23:14:26 +01:00
|
|
|
void vp9_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame,
|
|
|
|
VP9_COMMON *cm,
|
|
|
|
struct macroblockd_plane planes[MAX_MB_PLANE],
|
|
|
|
int frame_filter_level,
|
|
|
|
int y_only, int partial_frame,
|
|
|
|
VP9Worker *workers, int num_workers,
|
|
|
|
VP9LfSync *lf_sync) {
|
|
|
|
int start_mi_row, end_mi_row, mi_rows_to_filter;
|
|
|
|
|
|
|
|
if (!frame_filter_level) return;
|
|
|
|
|
|
|
|
start_mi_row = 0;
|
|
|
|
mi_rows_to_filter = cm->mi_rows;
|
|
|
|
if (partial_frame && cm->mi_rows > 8) {
|
|
|
|
start_mi_row = cm->mi_rows >> 1;
|
|
|
|
start_mi_row &= 0xfffffff8;
|
|
|
|
mi_rows_to_filter = MAX(cm->mi_rows / 8, 8);
|
|
|
|
}
|
|
|
|
end_mi_row = start_mi_row + mi_rows_to_filter;
|
|
|
|
vp9_loop_filter_frame_init(cm, frame_filter_level);
|
|
|
|
|
|
|
|
loop_filter_rows_mt(frame, cm, planes, start_mi_row, end_mi_row,
|
|
|
|
y_only, workers, num_workers, lf_sync);
|
|
|
|
}
|
|
|
|
|
2013-12-28 00:25:54 +01:00
|
|
|
// Set up nsync by width.
|
2015-01-06 23:14:26 +01:00
|
|
|
static INLINE int get_sync_range(int width) {
|
2013-12-28 00:25:54 +01:00
|
|
|
// nsync numbers are picked by testing. For example, for 4k
|
|
|
|
// video, using 4 gives best performance.
|
|
|
|
if (width < 640)
|
|
|
|
return 1;
|
|
|
|
else if (width <= 1280)
|
|
|
|
return 2;
|
|
|
|
else if (width <= 4096)
|
|
|
|
return 4;
|
|
|
|
else
|
|
|
|
return 8;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Allocate memory for lf row synchronization
|
2014-08-31 04:01:25 +02:00
|
|
|
void vp9_loop_filter_alloc(VP9LfSync *lf_sync, VP9_COMMON *cm, int rows,
|
2014-08-31 22:16:37 +02:00
|
|
|
int width, int num_workers) {
|
2014-08-29 02:11:31 +02:00
|
|
|
lf_sync->rows = rows;
|
2013-12-28 00:25:54 +01:00
|
|
|
#if CONFIG_MULTITHREAD
|
2014-08-29 02:11:31 +02:00
|
|
|
{
|
|
|
|
int i;
|
2013-12-28 00:25:54 +01:00
|
|
|
|
2014-08-29 02:11:31 +02:00
|
|
|
CHECK_MEM_ERROR(cm, lf_sync->mutex_,
|
|
|
|
vpx_malloc(sizeof(*lf_sync->mutex_) * rows));
|
2014-10-06 23:30:01 +02:00
|
|
|
if (lf_sync->mutex_) {
|
|
|
|
for (i = 0; i < rows; ++i) {
|
|
|
|
pthread_mutex_init(&lf_sync->mutex_[i], NULL);
|
|
|
|
}
|
2014-08-29 02:11:31 +02:00
|
|
|
}
|
2014-02-06 08:19:26 +01:00
|
|
|
|
2014-08-29 02:11:31 +02:00
|
|
|
CHECK_MEM_ERROR(cm, lf_sync->cond_,
|
|
|
|
vpx_malloc(sizeof(*lf_sync->cond_) * rows));
|
2014-10-06 23:30:01 +02:00
|
|
|
if (lf_sync->cond_) {
|
|
|
|
for (i = 0; i < rows; ++i) {
|
|
|
|
pthread_cond_init(&lf_sync->cond_[i], NULL);
|
|
|
|
}
|
2014-08-29 02:11:31 +02:00
|
|
|
}
|
2013-12-28 00:25:54 +01:00
|
|
|
}
|
|
|
|
#endif // CONFIG_MULTITHREAD
|
|
|
|
|
2014-08-31 22:16:37 +02:00
|
|
|
CHECK_MEM_ERROR(cm, lf_sync->lfdata,
|
|
|
|
vpx_malloc(num_workers * sizeof(*lf_sync->lfdata)));
|
|
|
|
lf_sync->num_workers = num_workers;
|
|
|
|
|
2013-12-28 00:25:54 +01:00
|
|
|
CHECK_MEM_ERROR(cm, lf_sync->cur_sb_col,
|
|
|
|
vpx_malloc(sizeof(*lf_sync->cur_sb_col) * rows));
|
|
|
|
|
|
|
|
// Set up nsync.
|
|
|
|
lf_sync->sync_range = get_sync_range(width);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Deallocate lf synchronization related mutex and data
|
2014-08-29 02:11:31 +02:00
|
|
|
void vp9_loop_filter_dealloc(VP9LfSync *lf_sync) {
|
2013-12-28 00:25:54 +01:00
|
|
|
if (lf_sync != NULL) {
|
2014-04-11 01:17:49 +02:00
|
|
|
#if CONFIG_MULTITHREAD
|
2013-12-28 00:25:54 +01:00
|
|
|
int i;
|
|
|
|
|
2014-02-06 08:19:26 +01:00
|
|
|
if (lf_sync->mutex_ != NULL) {
|
2014-08-29 02:11:31 +02:00
|
|
|
for (i = 0; i < lf_sync->rows; ++i) {
|
2014-02-06 08:19:26 +01:00
|
|
|
pthread_mutex_destroy(&lf_sync->mutex_[i]);
|
|
|
|
}
|
|
|
|
vpx_free(lf_sync->mutex_);
|
|
|
|
}
|
|
|
|
if (lf_sync->cond_ != NULL) {
|
2014-08-29 02:11:31 +02:00
|
|
|
for (i = 0; i < lf_sync->rows; ++i) {
|
2014-02-06 08:19:26 +01:00
|
|
|
pthread_cond_destroy(&lf_sync->cond_[i]);
|
|
|
|
}
|
|
|
|
vpx_free(lf_sync->cond_);
|
2013-12-28 00:25:54 +01:00
|
|
|
}
|
2014-04-11 01:17:49 +02:00
|
|
|
#endif // CONFIG_MULTITHREAD
|
2014-08-31 22:16:37 +02:00
|
|
|
vpx_free(lf_sync->lfdata);
|
2013-12-28 00:25:54 +01:00
|
|
|
vpx_free(lf_sync->cur_sb_col);
|
2014-02-06 08:19:26 +01:00
|
|
|
// clear the structure as the source of this call may be a resize in which
|
|
|
|
// case this call will be followed by an _alloc() which may fail.
|
2014-04-11 01:17:49 +02:00
|
|
|
vp9_zero(*lf_sync);
|
2013-12-28 00:25:54 +01:00
|
|
|
}
|
|
|
|
}
|
2015-02-06 20:37:45 +01:00
|
|
|
|
|
|
|
// Accumulate frame counts.
|
|
|
|
void vp9_accumulate_frame_counts(VP9_COMMON *cm, FRAME_COUNTS *counts,
|
|
|
|
int is_dec) {
|
|
|
|
int i, j, k, l, m;
|
|
|
|
|
|
|
|
for (i = 0; i < BLOCK_SIZE_GROUPS; i++)
|
|
|
|
for (j = 0; j < INTRA_MODES; j++)
|
|
|
|
cm->counts.y_mode[i][j] += counts->y_mode[i][j];
|
|
|
|
|
|
|
|
for (i = 0; i < INTRA_MODES; i++)
|
|
|
|
for (j = 0; j < INTRA_MODES; j++)
|
|
|
|
cm->counts.uv_mode[i][j] += counts->uv_mode[i][j];
|
|
|
|
|
|
|
|
for (i = 0; i < PARTITION_CONTEXTS; i++)
|
|
|
|
for (j = 0; j < PARTITION_TYPES; j++)
|
|
|
|
cm->counts.partition[i][j] += counts->partition[i][j];
|
|
|
|
|
|
|
|
if (is_dec) {
|
|
|
|
int n;
|
|
|
|
for (i = 0; i < TX_SIZES; i++)
|
|
|
|
for (j = 0; j < PLANE_TYPES; j++)
|
|
|
|
for (k = 0; k < REF_TYPES; k++)
|
|
|
|
for (l = 0; l < COEF_BANDS; l++)
|
|
|
|
for (m = 0; m < COEFF_CONTEXTS; m++) {
|
|
|
|
cm->counts.eob_branch[i][j][k][l][m] +=
|
|
|
|
counts->eob_branch[i][j][k][l][m];
|
|
|
|
for (n = 0; n < UNCONSTRAINED_NODES + 1; n++)
|
|
|
|
cm->counts.coef[i][j][k][l][m][n] +=
|
|
|
|
counts->coef[i][j][k][l][m][n];
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < TX_SIZES; i++)
|
|
|
|
for (j = 0; j < PLANE_TYPES; j++)
|
|
|
|
for (k = 0; k < REF_TYPES; k++)
|
|
|
|
for (l = 0; l < COEF_BANDS; l++)
|
|
|
|
for (m = 0; m < COEFF_CONTEXTS; m++)
|
|
|
|
cm->counts.eob_branch[i][j][k][l][m] +=
|
|
|
|
counts->eob_branch[i][j][k][l][m];
|
|
|
|
// In the encoder, cm->counts.coef is only updated at frame
|
|
|
|
// level, so not need to accumulate it here.
|
|
|
|
// for (n = 0; n < UNCONSTRAINED_NODES + 1; n++)
|
|
|
|
// cm->counts.coef[i][j][k][l][m][n] +=
|
|
|
|
// counts->coef[i][j][k][l][m][n];
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < SWITCHABLE_FILTER_CONTEXTS; i++)
|
|
|
|
for (j = 0; j < SWITCHABLE_FILTERS; j++)
|
|
|
|
cm->counts.switchable_interp[i][j] += counts->switchable_interp[i][j];
|
|
|
|
|
|
|
|
for (i = 0; i < INTER_MODE_CONTEXTS; i++)
|
|
|
|
for (j = 0; j < INTER_MODES; j++)
|
|
|
|
cm->counts.inter_mode[i][j] += counts->inter_mode[i][j];
|
|
|
|
|
|
|
|
for (i = 0; i < INTRA_INTER_CONTEXTS; i++)
|
|
|
|
for (j = 0; j < 2; j++)
|
|
|
|
cm->counts.intra_inter[i][j] += counts->intra_inter[i][j];
|
|
|
|
|
|
|
|
for (i = 0; i < COMP_INTER_CONTEXTS; i++)
|
|
|
|
for (j = 0; j < 2; j++)
|
|
|
|
cm->counts.comp_inter[i][j] += counts->comp_inter[i][j];
|
|
|
|
|
|
|
|
for (i = 0; i < REF_CONTEXTS; i++)
|
|
|
|
for (j = 0; j < 2; j++)
|
|
|
|
for (k = 0; k < 2; k++)
|
|
|
|
cm->counts.single_ref[i][j][k] += counts->single_ref[i][j][k];
|
|
|
|
|
|
|
|
for (i = 0; i < REF_CONTEXTS; i++)
|
|
|
|
for (j = 0; j < 2; j++)
|
|
|
|
cm->counts.comp_ref[i][j] += counts->comp_ref[i][j];
|
|
|
|
|
|
|
|
for (i = 0; i < TX_SIZE_CONTEXTS; i++) {
|
|
|
|
for (j = 0; j < TX_SIZES; j++)
|
|
|
|
cm->counts.tx.p32x32[i][j] += counts->tx.p32x32[i][j];
|
|
|
|
|
|
|
|
for (j = 0; j < TX_SIZES - 1; j++)
|
|
|
|
cm->counts.tx.p16x16[i][j] += counts->tx.p16x16[i][j];
|
|
|
|
|
|
|
|
for (j = 0; j < TX_SIZES - 2; j++)
|
|
|
|
cm->counts.tx.p8x8[i][j] += counts->tx.p8x8[i][j];
|
|
|
|
}
|
|
|
|
|
2015-03-10 17:53:45 +01:00
|
|
|
for (i = 0; i < TX_SIZES; i++)
|
|
|
|
cm->counts.tx.tx_totals[i] += counts->tx.tx_totals[i];
|
|
|
|
|
2015-02-06 20:37:45 +01:00
|
|
|
for (i = 0; i < SKIP_CONTEXTS; i++)
|
|
|
|
for (j = 0; j < 2; j++)
|
|
|
|
cm->counts.skip[i][j] += counts->skip[i][j];
|
|
|
|
|
|
|
|
for (i = 0; i < MV_JOINTS; i++)
|
|
|
|
cm->counts.mv.joints[i] += counts->mv.joints[i];
|
|
|
|
|
|
|
|
for (k = 0; k < 2; k++) {
|
|
|
|
nmv_component_counts *comps = &cm->counts.mv.comps[k];
|
|
|
|
nmv_component_counts *comps_t = &counts->mv.comps[k];
|
|
|
|
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
comps->sign[i] += comps_t->sign[i];
|
|
|
|
comps->class0_hp[i] += comps_t->class0_hp[i];
|
|
|
|
comps->hp[i] += comps_t->hp[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < MV_CLASSES; i++)
|
|
|
|
comps->classes[i] += comps_t->classes[i];
|
|
|
|
|
|
|
|
for (i = 0; i < CLASS0_SIZE; i++) {
|
|
|
|
comps->class0[i] += comps_t->class0[i];
|
|
|
|
for (j = 0; j < MV_FP_SIZE; j++)
|
|
|
|
comps->class0_fp[i][j] += comps_t->class0_fp[i][j];
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < MV_OFFSET_BITS; i++)
|
|
|
|
for (j = 0; j < 2; j++)
|
|
|
|
comps->bits[i][j] += comps_t->bits[i][j];
|
|
|
|
|
|
|
|
for (i = 0; i < MV_FP_SIZE; i++)
|
|
|
|
comps->fp[i] += comps_t->fp[i];
|
|
|
|
}
|
|
|
|
}
|