From 04c40d3d936fb504f8e7ddb6cd497945d1a89d1a Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Tue, 13 May 2014 10:28:47 -0700 Subject: [PATCH] cleanup -wextra warnings: vp9_decoder.c vp9_dthread.c Change-Id: Iaafe941545db98e9e3559096a955894646084ac2 --- vp9/decoder/vp9_decodeframe.c | 2 +- vp9/decoder/vp9_decoder.c | 9 ++++++--- vp9/decoder/vp9_dthread.c | 2 +- vp9/decoder/vp9_dthread.h | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 57ee4cdfc..099e685f0 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -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, diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c index 6f310c765..9e0811fbc 100644 --- a/vp9/decoder/vp9_decoder.c +++ b/vp9/decoder/vp9_decoder.c @@ -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; @@ -319,8 +322,8 @@ int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd, #if CONFIG_VP9_POSTPROC ret = vp9_post_proc_frame(&pbi->common, sd, flags); #else - *sd = *pbi->common.frame_to_show; - ret = 0; + *sd = *pbi->common.frame_to_show; + ret = 0; #endif /*!CONFIG_POSTPROC*/ vp9_clear_system_state(); return ret; diff --git a/vp9/decoder/vp9_dthread.c b/vp9/decoder/vp9_dthread.c index 5fe5ed79a..504fb9eda 100644 --- a/vp9/decoder/vp9_dthread.c +++ b/vp9/decoder/vp9_dthread.c @@ -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; diff --git a/vp9/decoder/vp9_dthread.h b/vp9/decoder/vp9_dthread.h index c3b7a293b..a727e2aef 100644 --- a/vp9/decoder/vp9_dthread.h +++ b/vp9/decoder/vp9_dthread.h @@ -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_