Merge "cleanup -wextra warnings:"
This commit is contained in:
commit
13e20b830e
@ -1350,7 +1350,7 @@ int vp9_decode_frame(VP9Decoder *pbi,
|
||||
*p_data_end = decode_tiles_mt(pbi, data + first_partition_size, data_end);
|
||||
// If multiple threads are used to decode tiles, then we use those threads
|
||||
// to do parallel loopfiltering.
|
||||
vp9_loop_filter_frame_mt(new_fb, pbi, cm, cm->lf.filter_level, 0, 0);
|
||||
vp9_loop_filter_frame_mt(new_fb, pbi, cm, cm->lf.filter_level, 0);
|
||||
} else {
|
||||
if (do_loopfilter_inline && pbi->lf_worker.data1 == NULL) {
|
||||
CHECK_MEM_ERROR(cm, pbi->lf_worker.data1,
|
||||
|
@ -304,11 +304,14 @@ int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd,
|
||||
int64_t *time_stamp, int64_t *time_end_stamp,
|
||||
vp9_ppflags_t *flags) {
|
||||
int ret = -1;
|
||||
#if !CONFIG_VP9_POSTPROC
|
||||
(void)*flags;
|
||||
#endif
|
||||
|
||||
if (pbi->ready_for_new_data == 1)
|
||||
return ret;
|
||||
|
||||
/* ie no raw frame to show!!! */
|
||||
/* no raw frame to show!!! */
|
||||
if (pbi->common.show_frame == 0)
|
||||
return ret;
|
||||
|
||||
|
@ -135,7 +135,7 @@ static int loop_filter_row_worker(void *arg1, void *arg2) {
|
||||
void vp9_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame,
|
||||
VP9Decoder *pbi, VP9_COMMON *cm,
|
||||
int frame_filter_level,
|
||||
int y_only, int partial_frame) {
|
||||
int y_only) {
|
||||
VP9LfSync *const lf_sync = &pbi->lf_row_sync;
|
||||
// Number of superblock rows and cols
|
||||
const int sb_rows = mi_cols_aligned_to_sb(cm->mi_rows) >> MI_BLOCK_SIZE_LOG2;
|
||||
|
@ -52,6 +52,6 @@ void vp9_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame,
|
||||
struct VP9Decoder *pbi,
|
||||
struct VP9Common *cm,
|
||||
int frame_filter_level,
|
||||
int y_only, int partial_frame);
|
||||
int y_only);
|
||||
|
||||
#endif // VP9_DECODER_VP9_DTHREAD_H_
|
||||
|
Loading…
Reference in New Issue
Block a user