Index: source/libvpx/vp9/decoder/vp9_decoder.c |
=================================================================== |
--- source/libvpx/vp9/decoder/vp9_decoder.c (revision 271012) |
+++ source/libvpx/vp9/decoder/vp9_decoder.c (working copy) |
@@ -42,7 +42,7 @@ |
} |
} |
-VP9Decoder *vp9_decoder_create(const VP9DecoderConfig *oxcf) { |
+VP9Decoder *vp9_decoder_create() { |
VP9Decoder *const pbi = vpx_memalign(32, sizeof(*pbi)); |
VP9_COMMON *const cm = pbi ? &pbi->common : NULL; |
@@ -66,7 +66,6 @@ |
vpx_memset(&cm->ref_frame_map, -1, sizeof(cm->ref_frame_map)); |
cm->current_video_frame = 0; |
- pbi->oxcf = *oxcf; |
pbi->ready_for_new_data = 1; |
pbi->decoded_key_frame = 0; |
@@ -280,16 +279,6 @@ |
swap_frame_buffers(pbi); |
- if (!pbi->do_loopfilter_inline) { |
- // If multiple threads are used to decode tiles, then we use those threads |
- // to do parallel loopfiltering. |
- if (pbi->num_tile_workers) { |
- vp9_loop_filter_frame_mt(pbi, cm, cm->lf.filter_level, 0, 0); |
- } else { |
- vp9_loop_filter_frame(cm, &pbi->mb, cm->lf.filter_level, 0, 0); |
- } |
- } |
- |
vp9_clear_system_state(); |
cm->last_width = cm->width; |
@@ -315,11 +304,14 @@ |
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; |
@@ -330,8 +322,8 @@ |
#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; |