libvpx: Pull from upstream

source/libvpx/vp9/encoder/vp9_ethread.c

 /*
  *  Copyright (c) 2014 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 61 matching lines @@
                     vpx_calloc(num_workers, sizeof(*cpi->tile_thr_data)));
 
     for (i = 0; i < num_workers; i++) {
       VP9Worker *const worker = &cpi->workers[i];
       EncWorkerData *thread_data = &cpi->tile_thr_data[i];
 
       ++cpi->num_workers;
       winterface->init(worker);
 
       if (i < num_workers - 1) {
-      thread_data->cpi = cpi;
+        thread_data->cpi = cpi;
 
-      // Allocate thread data.
-      CHECK_MEM_ERROR(cm, thread_data->td,
-                      vpx_memalign(32, sizeof(*thread_data->td)));
-      vp9_zero(*thread_data->td);
+        // Allocate thread data.
+        CHECK_MEM_ERROR(cm, thread_data->td,
+                        vpx_memalign(32, sizeof(*thread_data->td)));
+        vp9_zero(*thread_data->td);
 
-      // Set up pc_tree.
-      thread_data->td->leaf_tree = NULL;
-      thread_data->td->pc_tree = NULL;
-      vp9_setup_pc_tree(cm, thread_data->td);
+        // Set up pc_tree.
+        thread_data->td->leaf_tree = NULL;
+        thread_data->td->pc_tree = NULL;
+        vp9_setup_pc_tree(cm, thread_data->td);
 
-      // Allocate frame counters in thread data.
-      CHECK_MEM_ERROR(cm, thread_data->td->counts,
-                      vpx_calloc(1, sizeof(*thread_data->td->counts)));
+        // Allocate frame counters in thread data.
+        CHECK_MEM_ERROR(cm, thread_data->td->counts,
+                        vpx_calloc(1, sizeof(*thread_data->td->counts)));
 
-      // Create threads
-      if (!winterface->reset(worker))
-        vpx_internal_error(&cm->error, VPX_CODEC_ERROR,
-                           "Tile encoder thread creation failed");
+        // Create threads
+        if (!winterface->reset(worker))
+          vpx_internal_error(&cm->error, VPX_CODEC_ERROR,
+                             "Tile encoder thread creation failed");
       } else {
         // Main thread acts as a worker and uses the thread data in cpi.
         thread_data->cpi = cpi;
         thread_data->td = &cpi->td;
       }
 
       winterface->sync(worker);
     }
   }
 
@@ skipping 58 matching lines @@
     VP9Worker *const worker = &cpi->workers[i];
     EncWorkerData *const thread_data = (EncWorkerData*)worker->data1;
 
     // Accumulate counters.
     if (i < num_workers - 1) {
       vp9_accumulate_frame_counts(cm, thread_data->td->counts, 0);
       accumulate_rd_opt(&cpi->td, thread_data->td);
     }
   }
 }