Merge changes from topic 'tile-thread-cleanup'
authorJames Zern <jzern@google.com>
Thu, 17 Sep 2015 22:00:23 +0000 (22:00 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 17 Sep 2015 22:00:23 +0000 (22:00 +0000)
* changes:
  vp9/decode_tiles_mt: move frame count accum from loop
  VP9Decoder: remove duplicate tile_worker_info
  vp9/decode_tiles_mt: move some inits from inner loop
  vp9_accumulate_frame_counts: pass counts directly

1  2 
vp9/common/vp9_thread_common.h
vp9/decoder/vp9_decodeframe.c

@@@ -55,11 -51,7 +55,11 @@@ void vp9_loop_filter_frame_mt(YV12_BUFF
                                VPxWorker *workers, int num_workers,
                                VP9LfSync *lf_sync);
  
- void vp9_accumulate_frame_counts(struct VP9Common *cm,
-                                  struct FRAME_COUNTS *counts, int is_dec);
+ void vp9_accumulate_frame_counts(struct FRAME_COUNTS *accum,
+                                  const struct FRAME_COUNTS *counts, int is_dec);
  
 +#ifdef __cplusplus
 +}  // extern "C"
 +#endif
 +
  #endif  // VP9_COMMON_VP9_LOOPFILTER_THREAD_H_
Simple merge