From: James Zern <jzern@google.com>
Date: Thu, 17 Sep 2015 22:00:23 +0000 (+0000)
Subject: Merge changes from topic 'tile-thread-cleanup'
X-Git-Tag: v1.5.0~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d8decc16274b4c2ed1b7c0636b7666a1c57f3d0;p=libvpx

Merge changes from topic 'tile-thread-cleanup'

* 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
---

9d8decc16274b4c2ed1b7c0636b7666a1c57f3d0
diff --cc vp9/common/vp9_thread_common.h
index 04666b62c,9b83fd6a5..db6587fcb
--- a/vp9/common/vp9_thread_common.h
+++ b/vp9/common/vp9_thread_common.h
@@@ -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_