Commit 04c40d3d authored by Yaowu Xu's avatar Yaowu Xu
Browse files

cleanup -wextra warnings:

  vp9_decoder.c
  vp9_dthread.c

Change-Id: Iaafe941545db98e9e3559096a955894646084ac2
parent 1fe6496b
...@@ -1350,7 +1350,7 @@ int vp9_decode_frame(VP9Decoder *pbi, ...@@ -1350,7 +1350,7 @@ int vp9_decode_frame(VP9Decoder *pbi,
*p_data_end = decode_tiles_mt(pbi, data + first_partition_size, data_end); *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 // If multiple threads are used to decode tiles, then we use those threads
// to do parallel loopfiltering. // 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 { } else {
if (do_loopfilter_inline && pbi->lf_worker.data1 == NULL) { if (do_loopfilter_inline && pbi->lf_worker.data1 == NULL) {
CHECK_MEM_ERROR(cm, pbi->lf_worker.data1, CHECK_MEM_ERROR(cm, pbi->lf_worker.data1,
......
...@@ -304,11 +304,14 @@ int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd, ...@@ -304,11 +304,14 @@ int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd,
int64_t *time_stamp, int64_t *time_end_stamp, int64_t *time_stamp, int64_t *time_end_stamp,
vp9_ppflags_t *flags) { vp9_ppflags_t *flags) {
int ret = -1; int ret = -1;
#if !CONFIG_VP9_POSTPROC
(void)*flags;
#endif
if (pbi->ready_for_new_data == 1) if (pbi->ready_for_new_data == 1)
return ret; return ret;
/* ie no raw frame to show!!! */ /* no raw frame to show!!! */
if (pbi->common.show_frame == 0) if (pbi->common.show_frame == 0)
return ret; return ret;
...@@ -319,8 +322,8 @@ int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd, ...@@ -319,8 +322,8 @@ int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd,
#if CONFIG_VP9_POSTPROC #if CONFIG_VP9_POSTPROC
ret = vp9_post_proc_frame(&pbi->common, sd, flags); ret = vp9_post_proc_frame(&pbi->common, sd, flags);
#else #else
*sd = *pbi->common.frame_to_show; *sd = *pbi->common.frame_to_show;
ret = 0; ret = 0;
#endif /*!CONFIG_POSTPROC*/ #endif /*!CONFIG_POSTPROC*/
vp9_clear_system_state(); vp9_clear_system_state();
return ret; return ret;
......
...@@ -135,7 +135,7 @@ static int loop_filter_row_worker(void *arg1, void *arg2) { ...@@ -135,7 +135,7 @@ static int loop_filter_row_worker(void *arg1, void *arg2) {
void vp9_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame, void vp9_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame,
VP9Decoder *pbi, VP9_COMMON *cm, VP9Decoder *pbi, VP9_COMMON *cm,
int frame_filter_level, int frame_filter_level,
int y_only, int partial_frame) { int y_only) {
VP9LfSync *const lf_sync = &pbi->lf_row_sync; VP9LfSync *const lf_sync = &pbi->lf_row_sync;
// Number of superblock rows and cols // Number of superblock rows and cols
const int sb_rows = mi_cols_aligned_to_sb(cm->mi_rows) >> MI_BLOCK_SIZE_LOG2; 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, ...@@ -52,6 +52,6 @@ void vp9_loop_filter_frame_mt(YV12_BUFFER_CONFIG *frame,
struct VP9Decoder *pbi, struct VP9Decoder *pbi,
struct VP9Common *cm, struct VP9Common *cm,
int frame_filter_level, int frame_filter_level,
int y_only, int partial_frame); int y_only);
#endif // VP9_DECODER_VP9_DTHREAD_H_ #endif // VP9_DECODER_VP9_DTHREAD_H_
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment