ff0107f60d
There are flaws in current implementation of VP8 multithreading encoder and decoder as reported in the following issue: https://code.google.com/p/chromium/issues/detail?id=158922 Although the data race warnings are harmless, and wouldn't cause real problems while encoding and decoding videos, it is better to fix the warnings so that VP8 code could pass the TSan test. To synchronize the thread-shared data access and maintain the speed (i.e. decoding speed), use multiple mutexes based on mb_rows to reduce the number of synchronizations needed, make the reads and writes of the shared data protected, and reduce the number of mb_col writes by nsync times. The decoder speed tests showed < 3% speed loss while using 2 ~ 4 threads. Change-Id: Ie296defffcd86a693188b668270d811964227882
162 lines
4.0 KiB
C
162 lines
4.0 KiB
C
/*
|
|
* Copyright (c) 2010 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.
|
|
*/
|
|
|
|
|
|
#ifndef VP8_DECODER_ONYXD_INT_H_
|
|
#define VP8_DECODER_ONYXD_INT_H_
|
|
|
|
#include "vpx_config.h"
|
|
#include "vp8/common/onyxd.h"
|
|
#include "treereader.h"
|
|
#include "vp8/common/onyxc_int.h"
|
|
#include "vp8/common/threading.h"
|
|
|
|
#if CONFIG_ERROR_CONCEALMENT
|
|
#include "ec_types.h"
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
typedef struct
|
|
{
|
|
int ithread;
|
|
void *ptr1;
|
|
void *ptr2;
|
|
} DECODETHREAD_DATA;
|
|
|
|
typedef struct
|
|
{
|
|
MACROBLOCKD mbd;
|
|
} MB_ROW_DEC;
|
|
|
|
|
|
typedef struct
|
|
{
|
|
int enabled;
|
|
unsigned int count;
|
|
const unsigned char *ptrs[MAX_PARTITIONS];
|
|
unsigned int sizes[MAX_PARTITIONS];
|
|
} FRAGMENT_DATA;
|
|
|
|
#define MAX_FB_MT_DEC 32
|
|
|
|
struct frame_buffers
|
|
{
|
|
/*
|
|
* this struct will be populated with frame buffer management
|
|
* info in future commits. */
|
|
|
|
/* enable/disable frame-based threading */
|
|
int use_frame_threads;
|
|
|
|
/* decoder instances */
|
|
struct VP8D_COMP *pbi[MAX_FB_MT_DEC];
|
|
|
|
};
|
|
|
|
typedef struct VP8D_COMP
|
|
{
|
|
DECLARE_ALIGNED(16, MACROBLOCKD, mb);
|
|
|
|
YV12_BUFFER_CONFIG *dec_fb_ref[NUM_YV12_BUFFERS];
|
|
|
|
DECLARE_ALIGNED(16, VP8_COMMON, common);
|
|
|
|
/* the last partition will be used for the modes/mvs */
|
|
vp8_reader mbc[MAX_PARTITIONS];
|
|
|
|
VP8D_CONFIG oxcf;
|
|
|
|
FRAGMENT_DATA fragments;
|
|
|
|
#if CONFIG_MULTITHREAD
|
|
/* variable for threading */
|
|
|
|
int b_multithreaded_rd;
|
|
int max_threads;
|
|
int current_mb_col_main;
|
|
unsigned int decoding_thread_count;
|
|
int allocated_decoding_thread_count;
|
|
|
|
int mt_baseline_filter_level[MAX_MB_SEGMENTS];
|
|
int sync_range;
|
|
int *mt_current_mb_col; /* Each row remembers its already decoded column. */
|
|
pthread_mutex_t *pmutex;
|
|
pthread_mutex_t mt_mutex; /* mutex for b_multithreaded_rd */
|
|
|
|
unsigned char **mt_yabove_row; /* mb_rows x width */
|
|
unsigned char **mt_uabove_row;
|
|
unsigned char **mt_vabove_row;
|
|
unsigned char **mt_yleft_col; /* mb_rows x 16 */
|
|
unsigned char **mt_uleft_col; /* mb_rows x 8 */
|
|
unsigned char **mt_vleft_col; /* mb_rows x 8 */
|
|
|
|
MB_ROW_DEC *mb_row_di;
|
|
DECODETHREAD_DATA *de_thread_data;
|
|
|
|
pthread_t *h_decoding_thread;
|
|
sem_t *h_event_start_decoding;
|
|
sem_t h_event_end_decoding;
|
|
/* end of threading data */
|
|
#endif
|
|
|
|
int64_t last_time_stamp;
|
|
int ready_for_new_data;
|
|
|
|
vp8_prob prob_intra;
|
|
vp8_prob prob_last;
|
|
vp8_prob prob_gf;
|
|
vp8_prob prob_skip_false;
|
|
|
|
#if CONFIG_ERROR_CONCEALMENT
|
|
MB_OVERLAP *overlaps;
|
|
/* the mb num from which modes and mvs (first partition) are corrupt */
|
|
unsigned int mvs_corrupt_from_mb;
|
|
#endif
|
|
int ec_enabled;
|
|
int ec_active;
|
|
int decoded_key_frame;
|
|
int independent_partitions;
|
|
int frame_corrupt_residual;
|
|
|
|
vpx_decrypt_cb decrypt_cb;
|
|
void *decrypt_state;
|
|
} VP8D_COMP;
|
|
|
|
int vp8_decode_frame(VP8D_COMP *cpi);
|
|
|
|
int vp8_create_decoder_instances(struct frame_buffers *fb, VP8D_CONFIG *oxcf);
|
|
int vp8_remove_decoder_instances(struct frame_buffers *fb);
|
|
|
|
#if CONFIG_DEBUG
|
|
#define CHECK_MEM_ERROR(lval,expr) do {\
|
|
lval = (expr); \
|
|
if(!lval) \
|
|
vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\
|
|
"Failed to allocate "#lval" at %s:%d", \
|
|
__FILE__,__LINE__);\
|
|
} while(0)
|
|
#else
|
|
#define CHECK_MEM_ERROR(lval,expr) do {\
|
|
lval = (expr); \
|
|
if(!lval) \
|
|
vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR,\
|
|
"Failed to allocate "#lval);\
|
|
} while(0)
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
} // extern "C"
|
|
#endif
|
|
|
|
#endif // VP8_DECODER_ONYXD_INT_H_
|