shithub: libvpx

Info  •  Files  •  Log  •  Branches

Use vpx prefix for codec independent threading functions

Replace vp9_ prefix with vpx_ for common multi-threading functions.

Change-Id: I941a5ead9bfe8213fdad345511d2061b07797b55

--- a/test/vp9_thread_test.cc

+++ b/test/vp9_thread_test.cc

@@ -24,27 +24,27 @@

 using std::string;

-class VP9WorkerThreadTest : public ::testing::TestWithParam<bool> {

+class VPxWorkerThreadTest : public ::testing::TestWithParam<bool> {

  protected:

-  virtual ~VP9WorkerThreadTest() {}

+  virtual ~VPxWorkerThreadTest() {}

   virtual void SetUp() {

-    vp9_get_worker_interface()->init(&worker_);

+    vpx_get_worker_interface()->init(&worker_);

   }

   virtual void TearDown() {

-    vp9_get_worker_interface()->end(&worker_);

+    vpx_get_worker_interface()->end(&worker_);

   }

-  void Run(VP9Worker* worker) {

+  void Run(VPxWorker* worker) {

     const bool synchronous = GetParam();

     if (synchronous) {

-      vp9_get_worker_interface()->execute(worker);

+      vpx_get_worker_interface()->execute(worker);

     } else {

-      vp9_get_worker_interface()->launch(worker);

+      vpx_get_worker_interface()->launch(worker);

     }

   }

-  VP9Worker worker_;

+  VPxWorker worker_;

 };

 int ThreadHook(void* data, void* return_value) {

@@ -53,12 +53,12 @@

   return *reinterpret_cast<int*>(return_value);

 }

-TEST_P(VP9WorkerThreadTest, HookSuccess) {

+TEST_P(VPxWorkerThreadTest, HookSuccess) {

   // should be a no-op.

-  EXPECT_NE(vp9_get_worker_interface()->sync(&worker_), 0);

+  EXPECT_NE(vpx_get_worker_interface()->sync(&worker_), 0);

   for (int i = 0; i < 2; ++i) {

-    EXPECT_NE(vp9_get_worker_interface()->reset(&worker_), 0);

+    EXPECT_NE(vpx_get_worker_interface()->reset(&worker_), 0);

     int hook_data = 0;

     int return_value = 1;  // return successfully from the hook

@@ -67,17 +67,17 @@

     worker_.data2 = &return_value;

     Run(&worker_);

-    EXPECT_NE(vp9_get_worker_interface()->sync(&worker_), 0);

+    EXPECT_NE(vpx_get_worker_interface()->sync(&worker_), 0);

     EXPECT_FALSE(worker_.had_error);

     EXPECT_EQ(5, hook_data);

     // should be a no-op.

-    EXPECT_NE(vp9_get_worker_interface()->sync(&worker_), 0);

+    EXPECT_NE(vpx_get_worker_interface()->sync(&worker_), 0);

   }

 }

-TEST_P(VP9WorkerThreadTest, HookFailure) {

-  EXPECT_NE(vp9_get_worker_interface()->reset(&worker_), 0);

+TEST_P(VPxWorkerThreadTest, HookFailure) {

+  EXPECT_NE(vpx_get_worker_interface()->reset(&worker_), 0);

   int hook_data = 0;

   int return_value = 0;  // return failure from the hook

@@ -86,29 +86,29 @@

   worker_.data2 = &return_value;

   Run(&worker_);

-  EXPECT_FALSE(vp9_get_worker_interface()->sync(&worker_));

+  EXPECT_FALSE(vpx_get_worker_interface()->sync(&worker_));

   EXPECT_EQ(1, worker_.had_error);

   // Ensure _reset() clears the error and _launch() can be called again.

   return_value = 1;

-  EXPECT_NE(vp9_get_worker_interface()->reset(&worker_), 0);

+  EXPECT_NE(vpx_get_worker_interface()->reset(&worker_), 0);

   EXPECT_FALSE(worker_.had_error);

-  vp9_get_worker_interface()->launch(&worker_);

-  EXPECT_NE(vp9_get_worker_interface()->sync(&worker_), 0);

+  vpx_get_worker_interface()->launch(&worker_);

+  EXPECT_NE(vpx_get_worker_interface()->sync(&worker_), 0);

   EXPECT_FALSE(worker_.had_error);

 }

-TEST_P(VP9WorkerThreadTest, EndWithoutSync) {

+TEST_P(VPxWorkerThreadTest, EndWithoutSync) {

   // Create a large number of threads to increase the chances of detecting a

   // race. Doing more work in the hook is no guarantee as any race would occur

   // post hook execution in the main thread loop driver.

   static const int kNumWorkers = 64;

-  VP9Worker workers[kNumWorkers];

+  VPxWorker workers[kNumWorkers];

   int hook_data[kNumWorkers];

   int return_value[kNumWorkers];

   for (int n = 0; n < kNumWorkers; ++n) {

-    vp9_get_worker_interface()->init(&workers[n]);

+    vpx_get_worker_interface()->init(&workers[n]);

     return_value[n] = 1;  // return successfully from the hook

     workers[n].hook = ThreadHook;

     workers[n].data1 = &hook_data[n];

@@ -117,7 +117,7 @@

   for (int i = 0; i < 2; ++i) {

     for (int n = 0; n < kNumWorkers; ++n) {

-      EXPECT_NE(vp9_get_worker_interface()->reset(&workers[n]), 0);

+      EXPECT_NE(vpx_get_worker_interface()->reset(&workers[n]), 0);

       hook_data[n] = 0;

     }

@@ -126,16 +126,16 @@

     }

     for (int n = kNumWorkers - 1; n >= 0; --n) {

-      vp9_get_worker_interface()->end(&workers[n]);

+      vpx_get_worker_interface()->end(&workers[n]);

     }

   }

 }

-TEST(VP9WorkerThreadTest, TestInterfaceAPI) {

-  EXPECT_EQ(0, vp9_set_worker_interface(NULL));

-  EXPECT_TRUE(vp9_get_worker_interface() != NULL);

+TEST(VPxWorkerThreadTest, TestInterfaceAPI) {

+  EXPECT_EQ(0, vpx_set_worker_interface(NULL));

+  EXPECT_TRUE(vpx_get_worker_interface() != NULL);

   for (int i = 0; i < 6; ++i) {

-    VP9WorkerInterface winterface = *vp9_get_worker_interface();

+    VPxWorkerInterface winterface = *vpx_get_worker_interface();

     switch (i) {

       default:

       case 0: winterface.init = NULL; break;

@@ -145,7 +145,7 @@

       case 4: winterface.execute = NULL; break;

       case 5: winterface.end = NULL; break;

     }

-    EXPECT_EQ(0, vp9_set_worker_interface(&winterface));

+    EXPECT_EQ(0, vpx_set_worker_interface(&winterface));

   }

 }

@@ -202,21 +202,21 @@

 // hang.

 namespace impl {

-void Init(VP9Worker *const worker) { memset(worker, 0, sizeof(*worker)); }

-int Reset(VP9Worker *const /*worker*/) { return 1; }

-int Sync(VP9Worker *const worker) { return !worker->had_error; }

+void Init(VPxWorker *const worker) { memset(worker, 0, sizeof(*worker)); }

+int Reset(VPxWorker *const /*worker*/) { return 1; }

+int Sync(VPxWorker *const worker) { return !worker->had_error; }

-void Execute(VP9Worker *const worker) {

+void Execute(VPxWorker *const worker) {

   worker->had_error |= !worker->hook(worker->data1, worker->data2);

 }

-void Launch(VP9Worker *const worker) { Execute(worker); }

-void End(VP9Worker *const /*worker*/) {}

+void Launch(VPxWorker *const worker) { Execute(worker); }

+void End(VPxWorker *const /*worker*/) {}

 }  // namespace impl

-TEST(VP9WorkerThreadTest, TestSerialInterface) {

-  static const VP9WorkerInterface serial_interface = {

+TEST(VPxWorkerThreadTest, TestSerialInterface) {

+  static const VPxWorkerInterface serial_interface = {

     impl::Init, impl::Reset, impl::Sync, impl::Launch, impl::Execute, impl::End

   };

   // TODO(jzern): Avoid using a file that will use the row-based thread

@@ -225,13 +225,13 @@

   // progress in the row above before proceeding.

   static const char expected_md5[] = "b35a1b707b28e82be025d960aba039bc";

   static const char filename[] = "vp90-2-03-size-226x226.webm";

-  VP9WorkerInterface default_interface = *vp9_get_worker_interface();

+  VPxWorkerInterface default_interface = *vpx_get_worker_interface();

-  EXPECT_NE(vp9_set_worker_interface(&serial_interface), 0);

+  EXPECT_NE(vpx_set_worker_interface(&serial_interface), 0);

   EXPECT_EQ(expected_md5, DecodeFile(filename, 2));

   // Reset the interface.

-  EXPECT_NE(vp9_set_worker_interface(&default_interface), 0);

+  EXPECT_NE(vpx_set_worker_interface(&default_interface), 0);

   EXPECT_EQ(expected_md5, DecodeFile(filename, 2));

 }

@@ -309,6 +309,6 @@

 }

 #endif  // CONFIG_WEBM_IO

-INSTANTIATE_TEST_CASE_P(Synchronous, VP9WorkerThreadTest, ::testing::Bool());

+INSTANTIATE_TEST_CASE_P(Synchronous, VPxWorkerThreadTest, ::testing::Bool());

 }  // namespace

--- a/vp9/common/vp9_onyxc_int.h

+++ b/vp9/common/vp9_onyxc_int.h

@@ -80,7 +80,7 @@

   // frame_worker_owner indicates which FrameWorker owns this buffer. NULL means

   // that no FrameWorker owns, or is decoding, this buffer.

-  VP9Worker *frame_worker_owner;

+  VPxWorker *frame_worker_owner;

   // row and col indicate which position frame has been decoded to in real

   // pixel unit. They are reset to -1 when decoding begins and set to INT_MAX

--- a/vp9/common/vp9_thread_common.c

+++ b/vp9/common/vp9_thread_common.c

@@ -157,9 +157,9 @@

                                 VP9_COMMON *cm,

                                 struct macroblockd_plane planes[MAX_MB_PLANE],

                                 int start, int stop, int y_only,

-                                VP9Worker *workers, int nworkers,

+                                VPxWorker *workers, int nworkers,

                                 VP9LfSync *lf_sync) {

-  const VP9WorkerInterface *const winterface = vp9_get_worker_interface();

+  const VPxWorkerInterface *const winterface = vpx_get_worker_interface();

   // Number of superblock rows and cols

   const int sb_rows = mi_cols_aligned_to_sb(cm->mi_rows) >> MI_BLOCK_SIZE_LOG2;

   // Decoder may allocate more threads than number of tiles based on user's

@@ -186,10 +186,10 @@

   // because of contention. If the multithreading code changes in the future

   // then the number of workers used by the loopfilter should be revisited.

   for (i = 0; i < num_workers; ++i) {

-    VP9Worker *const worker = &workers[i];

+    VPxWorker *const worker = &workers[i];

     LFWorkerData *const lf_data = &lf_sync->lfdata[i];

-    worker->hook = (VP9WorkerHook)loop_filter_row_worker;

+    worker->hook = (VPxWorkerHook)loop_filter_row_worker;

     worker->data1 = lf_sync;

     worker->data2 = lf_data;

@@ -218,7 +218,7 @@

                               struct macroblockd_plane planes[MAX_MB_PLANE],

                               int frame_filter_level,

                               int y_only, int partial_frame,

-                              VP9Worker *workers, int num_workers,

+                              VPxWorker *workers, int num_workers,

                               VP9LfSync *lf_sync) {

   int start_mi_row, end_mi_row, mi_rows_to_filter;

--- a/vp9/common/vp9_thread_common.h

+++ b/vp9/common/vp9_thread_common.h

@@ -48,7 +48,7 @@

                               struct macroblockd_plane planes[MAX_MB_PLANE],

                               int frame_filter_level,

                               int y_only, int partial_frame,

-                              VP9Worker *workers, int num_workers,

+                              VPxWorker *workers, int num_workers,

                               VP9LfSync *lf_sync);

 void vp9_accumulate_frame_counts(struct VP9Common *cm,

--- a/vp9/decoder/vp9_decodeframe.c

+++ b/vp9/decoder/vp9_decodeframe.c

@@ -1259,7 +1259,7 @@

                                    const uint8_t *data,

                                    const uint8_t *data_end) {

   VP9_COMMON *const cm = &pbi->common;

-  const VP9WorkerInterface *const winterface = vp9_get_worker_interface();

+  const VPxWorkerInterface *const winterface = vpx_get_worker_interface();

   const int aligned_cols = mi_cols_aligned_to_sb(cm->mi_cols);

   const int tile_cols = 1 << cm->log2_tile_cols;

   const int tile_rows = 1 << cm->log2_tile_rows;

@@ -1272,7 +1272,7 @@

       pbi->lf_worker.data1 == NULL) {

     CHECK_MEM_ERROR(cm, pbi->lf_worker.data1,

                     vpx_memalign(32, sizeof(LFWorkerData)));

-    pbi->lf_worker.hook = (VP9WorkerHook)vp9_loop_filter_worker;

+    pbi->lf_worker.hook = (VPxWorkerHook)vp9_loop_filter_worker;

     if (pbi->max_threads > 1 && !winterface->reset(&pbi->lf_worker)) {

       vpx_internal_error(&cm->error, VPX_CODEC_ERROR,

                          "Loop filter thread creation failed");

@@ -1434,7 +1434,7 @@

                                       const uint8_t *data,

                                       const uint8_t *data_end) {

   VP9_COMMON *const cm = &pbi->common;

-  const VP9WorkerInterface *const winterface = vp9_get_worker_interface();

+  const VPxWorkerInterface *const winterface = vpx_get_worker_interface();

   const uint8_t *bit_reader_end = NULL;

   const int aligned_mi_cols = mi_cols_aligned_to_sb(cm->mi_cols);

   const int tile_cols = 1 << cm->log2_tile_cols;

@@ -1464,7 +1464,7 @@

     CHECK_MEM_ERROR(cm, pbi->tile_worker_info,

                     vpx_malloc(num_threads * sizeof(*pbi->tile_worker_info)));

     for (i = 0; i < num_threads; ++i) {

-      VP9Worker *const worker = &pbi->tile_workers[i];

+      VPxWorker *const worker = &pbi->tile_workers[i];

       ++pbi->num_tile_workers;

       winterface->init(worker);

@@ -1477,9 +1477,9 @@

   // Reset tile decoding hook

   for (n = 0; n < num_workers; ++n) {

-    VP9Worker *const worker = &pbi->tile_workers[n];

+    VPxWorker *const worker = &pbi->tile_workers[n];

     winterface->sync(worker);

-    worker->hook = (VP9WorkerHook)tile_worker_hook;

+    worker->hook = (VPxWorkerHook)tile_worker_hook;

     worker->data1 = &pbi->tile_worker_data[n];

     worker->data2 = &pbi->tile_worker_info[n];

   }

@@ -1529,7 +1529,7 @@

   while (n < tile_cols) {

     int i;

     for (i = 0; i < num_workers && n < tile_cols; ++i) {

-      VP9Worker *const worker = &pbi->tile_workers[i];

+      VPxWorker *const worker = &pbi->tile_workers[i];

       TileWorkerData *const tile_data = (TileWorkerData*)worker->data1;

       TileInfo *const tile = (TileInfo*)worker->data2;

       TileBuffer *const buf = &tile_buffers[0][n];

@@ -1561,7 +1561,7 @@

     }

     for (; i > 0; --i) {

-      VP9Worker *const worker = &pbi->tile_workers[i - 1];

+      VPxWorker *const worker = &pbi->tile_workers[i - 1];

       // TODO(jzern): The tile may have specific error data associated with

       // its vpx_internal_error_info which could be propagated to the main info

       // in cm. Additionally once the threads have been synced and an error is

@@ -2020,7 +2020,7 @@

   // If encoded in frame parallel mode, frame context is ready after decoding

   // the frame header.

   if (pbi->frame_parallel_decode && cm->frame_parallel_decoding_mode) {

-    VP9Worker *const worker = pbi->frame_worker_owner;

+    VPxWorker *const worker = pbi->frame_worker_owner;

     FrameWorkerData *const frame_worker_data = worker->data1;

     if (cm->refresh_frame_context) {

       context_updated = 1;

--- a/vp9/decoder/vp9_decoder.c

+++ b/vp9/decoder/vp9_decoder.c

@@ -118,7 +118,7 @@

   cm->error.setjmp = 0;

-  vp9_get_worker_interface()->init(&pbi->lf_worker);

+  vpx_get_worker_interface()->init(&pbi->lf_worker);

   return pbi;

 }

@@ -126,12 +126,12 @@

 void vp9_decoder_remove(VP9Decoder *pbi) {

   int i;

-  vp9_get_worker_interface()->end(&pbi->lf_worker);

+  vpx_get_worker_interface()->end(&pbi->lf_worker);

   vpx_free(pbi->lf_worker.data1);

   vpx_free(pbi->tile_data);

   for (i = 0; i < pbi->num_tile_workers; ++i) {

-    VP9Worker *const worker = &pbi->tile_workers[i];

-    vp9_get_worker_interface()->end(worker);

+    VPxWorker *const worker = &pbi->tile_workers[i];

+    vpx_get_worker_interface()->end(worker);

   }

   vpx_free(pbi->tile_worker_data);

   vpx_free(pbi->tile_worker_info);

@@ -311,7 +311,7 @@

   pbi->hold_ref_buf = 0;

   if (pbi->frame_parallel_decode) {

-    VP9Worker *const worker = pbi->frame_worker_owner;

+    VPxWorker *const worker = pbi->frame_worker_owner;

     vp9_frameworker_lock_stats(worker);

     frame_bufs[cm->new_fb_idx].frame_worker_owner = worker;

     // Reset decoding progress.

@@ -325,7 +325,7 @@

   if (setjmp(cm->error.jmp)) {

-    const VP9WorkerInterface *const winterface = vp9_get_worker_interface();

+    const VPxWorkerInterface *const winterface = vpx_get_worker_interface();

     int i;

     cm->error.setjmp = 0;

@@ -387,7 +387,7 @@

   if (pbi->frame_parallel_decode) {

     // Need to lock the mutex here as another thread may

     // be accessing this buffer.

-    VP9Worker *const worker = pbi->frame_worker_owner;

+    VPxWorker *const worker = pbi->frame_worker_owner;

     FrameWorkerData *const frame_worker_data = worker->data1;

     vp9_frameworker_lock_stats(worker);

--- a/vp9/decoder/vp9_decoder.h

+++ b/vp9/decoder/vp9_decoder.h

@@ -57,9 +57,9 @@

   // the same.

   RefCntBuffer *cur_buf;   //  Current decoding frame buffer.

-  VP9Worker *frame_worker_owner;   // frame_worker that owns this pbi.

-  VP9Worker lf_worker;

-  VP9Worker *tile_workers;

+  VPxWorker *frame_worker_owner;   // frame_worker that owns this pbi.

+  VPxWorker lf_worker;

+  VPxWorker *tile_workers;

   TileWorkerData *tile_worker_data;

   TileInfo *tile_worker_info;

   int num_tile_workers;

--- a/vp9/decoder/vp9_dthread.c

+++ b/vp9/decoder/vp9_dthread.c

@@ -17,7 +17,7 @@

 // #define DEBUG_THREAD

 // TODO(hkuang): Clean up all the #ifdef in this file.

-void vp9_frameworker_lock_stats(VP9Worker *const worker) {

+void vp9_frameworker_lock_stats(VPxWorker *const worker) {

 #if CONFIG_MULTITHREAD

   FrameWorkerData *const worker_data = worker->data1;

   pthread_mutex_lock(&worker_data->stats_mutex);

@@ -26,7 +26,7 @@

 #endif

 }

-void vp9_frameworker_unlock_stats(VP9Worker *const worker) {

+void vp9_frameworker_unlock_stats(VPxWorker *const worker) {

 #if CONFIG_MULTITHREAD

   FrameWorkerData *const worker_data = worker->data1;

   pthread_mutex_unlock(&worker_data->stats_mutex);

@@ -35,7 +35,7 @@

 #endif

 }

-void vp9_frameworker_signal_stats(VP9Worker *const worker) {

+void vp9_frameworker_signal_stats(VPxWorker *const worker) {

 #if CONFIG_MULTITHREAD

   FrameWorkerData *const worker_data = worker->data1;

@@ -59,7 +59,7 @@

 #endif

 // TODO(hkuang): Remove worker parameter as it is only used in debug code.

-void vp9_frameworker_wait(VP9Worker *const worker, RefCntBuffer *const ref_buf,

+void vp9_frameworker_wait(VPxWorker *const worker, RefCntBuffer *const ref_buf,

                           int row) {

 #if CONFIG_MULTITHREAD

   if (!ref_buf)

@@ -74,7 +74,7 @@

   {

     // Find the worker thread that owns the reference frame. If the reference

     // frame has been fully decoded, it may not have owner.

-    VP9Worker *const ref_worker = ref_buf->frame_worker_owner;

+    VPxWorker *const ref_worker = ref_buf->frame_worker_owner;

     FrameWorkerData *const ref_worker_data =

         (FrameWorkerData *)ref_worker->data1;

     const VP9Decoder *const pbi = ref_worker_data->pbi;

@@ -114,7 +114,7 @@

 void vp9_frameworker_broadcast(RefCntBuffer *const buf, int row) {

 #if CONFIG_MULTITHREAD

-  VP9Worker *worker = buf->frame_worker_owner;

+  VPxWorker *worker = buf->frame_worker_owner;

 #ifdef DEBUG_THREAD

   {

@@ -134,8 +134,8 @@

 #endif  // CONFIG_MULTITHREAD

 }

-void vp9_frameworker_copy_context(VP9Worker *const dst_worker,

-                                  VP9Worker *const src_worker) {

+void vp9_frameworker_copy_context(VPxWorker *const dst_worker,

+                                  VPxWorker *const src_worker) {

 #if CONFIG_MULTITHREAD

   FrameWorkerData *const src_worker_data = (FrameWorkerData *)src_worker->data1;

   FrameWorkerData *const dst_worker_data = (FrameWorkerData *)dst_worker->data1;

--- a/vp9/decoder/vp9_dthread.h

+++ b/vp9/decoder/vp9_dthread.h

@@ -44,15 +44,15 @@

   int frame_decoded;        // Finished decoding current frame.

 } FrameWorkerData;

-void vp9_frameworker_lock_stats(VP9Worker *const worker);

-void vp9_frameworker_unlock_stats(VP9Worker *const worker);

-void vp9_frameworker_signal_stats(VP9Worker *const worker);

+void vp9_frameworker_lock_stats(VPxWorker *const worker);

+void vp9_frameworker_unlock_stats(VPxWorker *const worker);

+void vp9_frameworker_signal_stats(VPxWorker *const worker);

 // Wait until ref_buf has been decoded to row in real pixel unit.

 // Note: worker may already finish decoding ref_buf and release it in order to

 // start decoding next frame. So need to check whether worker is still decoding

 // ref_buf.

-void vp9_frameworker_wait(VP9Worker *const worker, RefCntBuffer *const ref_buf,

+void vp9_frameworker_wait(VPxWorker *const worker, RefCntBuffer *const ref_buf,

                           int row);

 // FrameWorker broadcasts its decoding progress so other workers that are

@@ -60,7 +60,7 @@

 void vp9_frameworker_broadcast(RefCntBuffer *const buf, int row);

 // Copy necessary decoding context from src worker to dst worker.

-void vp9_frameworker_copy_context(VP9Worker *const dst_worker,

-                                  VP9Worker *const src_worker);

+void vp9_frameworker_copy_context(VPxWorker *const dst_worker,

+                                  VPxWorker *const src_worker);

 #endif  // VP9_DECODER_VP9_DTHREAD_H_

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -1993,11 +1993,11 @@

 #endif

   for (t = 0; t < cpi->num_workers; ++t) {

-    VP9Worker *const worker = &cpi->workers[t];

+    VPxWorker *const worker = &cpi->workers[t];

     EncWorkerData *const thread_data = &cpi->tile_thr_data[t];

     // Deallocate allocated threads.

-    vp9_get_worker_interface()->end(worker);

+    vpx_get_worker_interface()->end(worker);

     // Deallocate allocated thread data.

     if (t < cpi->num_workers - 1) {

--- a/vp9/encoder/vp9_encoder.h

+++ b/vp9/encoder/vp9_encoder.h

@@ -496,7 +496,7 @@

   // Multi-threading

   int num_workers;

-  VP9Worker *workers;

+  VPxWorker *workers;

   struct EncWorkerData *tile_thr_data;

   VP9LfSync lf_row_sync;

 } VP9_COMP;

--- a/vp9/encoder/vp9_ethread.c

+++ b/vp9/encoder/vp9_ethread.c

@@ -69,7 +69,7 @@

 void vp9_encode_tiles_mt(VP9_COMP *cpi) {

   VP9_COMMON *const cm = &cpi->common;

   const int tile_cols = 1 << cm->log2_tile_cols;

-  const VP9WorkerInterface *const winterface = vp9_get_worker_interface();

+  const VPxWorkerInterface *const winterface = vpx_get_worker_interface();

   const int num_workers = MIN(cpi->oxcf.max_threads, tile_cols);

   int i;

@@ -94,7 +94,7 @@

                     sizeof(*cpi->tile_thr_data)));

     for (i = 0; i < allocated_workers; i++) {

-      VP9Worker *const worker = &cpi->workers[i];

+      VPxWorker *const worker = &cpi->workers[i];

       EncWorkerData *thread_data = &cpi->tile_thr_data[i];

       ++cpi->num_workers;

@@ -132,10 +132,10 @@

   }

   for (i = 0; i < num_workers; i++) {

-    VP9Worker *const worker = &cpi->workers[i];

+    VPxWorker *const worker = &cpi->workers[i];

     EncWorkerData *thread_data;

-    worker->hook = (VP9WorkerHook)enc_worker_hook;

+    worker->hook = (VPxWorkerHook)enc_worker_hook;

     worker->data1 = &cpi->tile_thr_data[i];

     worker->data2 = NULL;

     thread_data = (EncWorkerData*)worker->data1;

@@ -170,7 +170,7 @@

   // Encode a frame

   for (i = 0; i < num_workers; i++) {

-    VP9Worker *const worker = &cpi->workers[i];

+    VPxWorker *const worker = &cpi->workers[i];

     EncWorkerData *const thread_data = (EncWorkerData*)worker->data1;

     // Set the starting tile for each thread.

@@ -184,12 +184,12 @@

   // Encoding ends.

   for (i = 0; i < num_workers; i++) {

-    VP9Worker *const worker = &cpi->workers[i];

+    VPxWorker *const worker = &cpi->workers[i];

     winterface->sync(worker);

   }

   for (i = 0; i < num_workers; i++) {

-    VP9Worker *const worker = &cpi->workers[i];

+    VPxWorker *const worker = &cpi->workers[i];

     EncWorkerData *const thread_data = (EncWorkerData*)worker->data1;

     // Accumulate counters.

--- a/vp9/vp9_dx_iface.c

+++ b/vp9/vp9_dx_iface.c

@@ -59,7 +59,7 @@

   // Frame parallel related.

   int                     frame_parallel_decode;  // frame-based threading.

-  VP9Worker               *frame_workers;

+  VPxWorker               *frame_workers;

   int                     num_frame_workers;

   int                     next_submit_worker_id;

   int                     last_submit_worker_id;

@@ -112,10 +112,10 @@

   if (ctx->frame_workers != NULL) {

     int i;

     for (i = 0; i < ctx->num_frame_workers; ++i) {

-      VP9Worker *const worker = &ctx->frame_workers[i];

+      VPxWorker *const worker = &ctx->frame_workers[i];

       FrameWorkerData *const frame_worker_data =

           (FrameWorkerData *)worker->data1;

-      vp9_get_worker_interface()->end(worker);

+      vpx_get_worker_interface()->end(worker);

       vp9_remove_common(&frame_worker_data->pbi->common);

 #if CONFIG_VP9_POSTPROC

       vp9_free_postproc_buffers(&frame_worker_data->pbi->common);

@@ -279,7 +279,7 @@

   int i;

   for (i = 0; i < ctx->num_frame_workers; ++i) {

-    VP9Worker *const worker = &ctx->frame_workers[i];

+    VPxWorker *const worker = &ctx->frame_workers[i];

     FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;

     VP9_COMMON *const cm = &frame_worker_data->pbi->common;

     BufferPool *const pool = cm->buffer_pool;

@@ -336,7 +336,7 @@

     // the compressed data.

     if (frame_worker_data->result != 0 ||

         frame_worker_data->data + frame_worker_data->data_size - 1 > data) {

-      VP9Worker *const worker = frame_worker_data->pbi->frame_worker_owner;

+      VPxWorker *const worker = frame_worker_data->pbi->frame_worker_owner;

       BufferPool *const pool = frame_worker_data->pbi->common.buffer_pool;

       // Signal all the other threads that are waiting for this frame.

       vp9_frameworker_lock_stats(worker);

@@ -359,7 +359,7 @@

 static vpx_codec_err_t init_decoder(vpx_codec_alg_priv_t *ctx) {

   int i;

-  const VP9WorkerInterface *const winterface = vp9_get_worker_interface();

+  const VPxWorkerInterface *const winterface = vpx_get_worker_interface();

   ctx->last_show_frame = -1;

   ctx->next_submit_worker_id = 0;

@@ -387,7 +387,7 @@

     }

 #endif

-  ctx->frame_workers = (VP9Worker *)

+  ctx->frame_workers = (VPxWorker *)

       vpx_malloc(ctx->num_frame_workers * sizeof(*ctx->frame_workers));

   if (ctx->frame_workers == NULL) {

     set_error_detail(ctx, "Failed to allocate frame_workers");

@@ -395,7 +395,7 @@

   }

   for (i = 0; i < ctx->num_frame_workers; ++i) {

-    VP9Worker *const worker = &ctx->frame_workers[i];

+    VPxWorker *const worker = &ctx->frame_workers[i];

     FrameWorkerData *frame_worker_data = NULL;

     winterface->init(worker);

     worker->data1 = vpx_memalign(32, sizeof(FrameWorkerData));

@@ -435,7 +435,7 @@

     frame_worker_data->pbi->frame_parallel_decode = ctx->frame_parallel_decode;

     frame_worker_data->pbi->common.frame_parallel_decode =

         ctx->frame_parallel_decode;

-    worker->hook = (VP9WorkerHook)frame_worker_hook;

+    worker->hook = (VPxWorkerHook)frame_worker_hook;

     if (!winterface->reset(worker)) {

       set_error_detail(ctx, "Frame Worker thread creation failed");

       return VPX_CODEC_MEM_ERROR;

@@ -464,7 +464,7 @@

 static vpx_codec_err_t decode_one(vpx_codec_alg_priv_t *ctx,

                                   const uint8_t **data, unsigned int data_sz,

                                   void *user_priv, int64_t deadline) {

-  const VP9WorkerInterface *const winterface = vp9_get_worker_interface();

+  const VPxWorkerInterface *const winterface = vpx_get_worker_interface();

   (void)deadline;

   // Determine the stream parameters. Note that we rely on peek_si to

@@ -483,7 +483,7 @@

   }

   if (!ctx->frame_parallel_decode) {

-    VP9Worker *const worker = ctx->frame_workers;

+    VPxWorker *const worker = ctx->frame_workers;

     FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;

     frame_worker_data->data = *data;

     frame_worker_data->data_size = data_sz;

@@ -506,7 +506,7 @@

     check_resync(ctx, frame_worker_data->pbi);

   } else {

-    VP9Worker *const worker = &ctx->frame_workers[ctx->next_submit_worker_id];

+    VPxWorker *const worker = &ctx->frame_workers[ctx->next_submit_worker_id];

     FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;

     // Copy context from last worker thread to next worker thread.

     if (ctx->next_submit_worker_id != ctx->last_submit_worker_id)

@@ -554,8 +554,8 @@

 static void wait_worker_and_cache_frame(vpx_codec_alg_priv_t *ctx) {

   YV12_BUFFER_CONFIG sd;

   vp9_ppflags_t flags = {0, 0, 0};

-  const VP9WorkerInterface *const winterface = vp9_get_worker_interface();

-  VP9Worker *const worker = &ctx->frame_workers[ctx->next_output_worker_id];

+  const VPxWorkerInterface *const winterface = vpx_get_worker_interface();

+  VPxWorker *const worker = &ctx->frame_workers[ctx->next_output_worker_id];

   FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;

   ctx->next_output_worker_id =

       (ctx->next_output_worker_id + 1) % ctx->num_frame_workers;

@@ -746,8 +746,8 @@

     do {

       YV12_BUFFER_CONFIG sd;

       vp9_ppflags_t flags = {0, 0, 0};

-      const VP9WorkerInterface *const winterface = vp9_get_worker_interface();

-      VP9Worker *const worker =

+      const VPxWorkerInterface *const winterface = vpx_get_worker_interface();

+      VPxWorker *const worker =

           &ctx->frame_workers[ctx->next_output_worker_id];

       FrameWorkerData *const frame_worker_data =

           (FrameWorkerData *)worker->data1;

@@ -819,7 +819,7 @@

   if (data) {

     vpx_ref_frame_t *const frame = (vpx_ref_frame_t *)data;

     YV12_BUFFER_CONFIG sd;

-    VP9Worker *const worker = ctx->frame_workers;

+    VPxWorker *const worker = ctx->frame_workers;

     FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;

     image2yuvconfig(&frame->img, &sd);

     return vp9_set_reference_dec(&frame_worker_data->pbi->common,

@@ -842,7 +842,7 @@

   if (data) {

     vpx_ref_frame_t *frame = (vpx_ref_frame_t *) data;

     YV12_BUFFER_CONFIG sd;

-    VP9Worker *const worker = ctx->frame_workers;

+    VPxWorker *const worker = ctx->frame_workers;

     FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;

     image2yuvconfig(&frame->img, &sd);

     return vp9_copy_reference_dec(frame_worker_data->pbi,

@@ -864,7 +864,7 @@

   if (data) {

     YV12_BUFFER_CONFIG* fb;

-    VP9Worker *const worker = ctx->frame_workers;

+    VPxWorker *const worker = ctx->frame_workers;

     FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;

     fb = get_ref_frame(&frame_worker_data->pbi->common, data->idx);

     if (fb == NULL) return VPX_CODEC_ERROR;

@@ -913,7 +913,7 @@

   if (update_info) {

     if (ctx->frame_workers) {

-      VP9Worker *const worker = ctx->frame_workers;

+      VPxWorker *const worker = ctx->frame_workers;

       FrameWorkerData *const frame_worker_data =

           (FrameWorkerData *)worker->data1;

       *update_info = frame_worker_data->pbi->refresh_frame_flags;

@@ -932,7 +932,7 @@

   if (corrupted) {

     if (ctx->frame_workers) {

-      VP9Worker *const worker = ctx->frame_workers;

+      VPxWorker *const worker = ctx->frame_workers;

       FrameWorkerData *const frame_worker_data =

           (FrameWorkerData *)worker->data1;

       RefCntBuffer *const frame_bufs =

@@ -962,7 +962,7 @@

   if (frame_size) {

     if (ctx->frame_workers) {

-      VP9Worker *const worker = ctx->frame_workers;

+      VPxWorker *const worker = ctx->frame_workers;

       FrameWorkerData *const frame_worker_data =

           (FrameWorkerData *)worker->data1;

       const VP9_COMMON *const cm = &frame_worker_data->pbi->common;

@@ -989,7 +989,7 @@

   if (display_size) {

     if (ctx->frame_workers) {

-      VP9Worker *const worker = ctx->frame_workers;

+      VPxWorker *const worker = ctx->frame_workers;

       FrameWorkerData *const frame_worker_data =

           (FrameWorkerData *)worker->data1;

       const VP9_COMMON *const cm = &frame_worker_data->pbi->common;

@@ -1007,7 +1007,7 @@

 static vpx_codec_err_t ctrl_get_bit_depth(vpx_codec_alg_priv_t *ctx,

                                           va_list args) {

   unsigned int *const bit_depth = va_arg(args, unsigned int *);

-  VP9Worker *const worker = &ctx->frame_workers[ctx->next_output_worker_id];

+  VPxWorker *const worker = &ctx->frame_workers[ctx->next_output_worker_id];

   if (bit_depth) {

     if (worker) {

@@ -1053,7 +1053,7 @@

   ctx->byte_alignment = byte_alignment;

   if (ctx->frame_workers) {

-    VP9Worker *const worker = ctx->frame_workers;

+    VPxWorker *const worker = ctx->frame_workers;

     FrameWorkerData *const frame_worker_data =

         (FrameWorkerData *)worker->data1;

     frame_worker_data->pbi->common.byte_alignment = byte_alignment;

@@ -1066,7 +1066,7 @@

   ctx->skip_loop_filter = va_arg(args, int);

   if (ctx->frame_workers) {

-    VP9Worker *const worker = ctx->frame_workers;

+    VPxWorker *const worker = ctx->frame_workers;

     FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;

     frame_worker_data->pbi->common.skip_loop_filter = ctx->skip_loop_filter;

   }

--- a/vpx_thread/vpx_thread.c

+++ b/vpx_thread/vpx_thread.c

@@ -20,7 +20,7 @@

 #if CONFIG_MULTITHREAD

-struct VP9WorkerImpl {

+struct VPxWorkerImpl {

   pthread_mutex_t mutex_;

   pthread_cond_t  condition_;

   pthread_t       thread_;

@@ -28,10 +28,10 @@

 //------------------------------------------------------------------------------

-static void execute(VP9Worker *const worker);  // Forward declaration.

+static void execute(VPxWorker *const worker);  // Forward declaration.

 static THREADFN thread_loop(void *ptr) {

-  VP9Worker *const worker = (VP9Worker*)ptr;

+  VPxWorker *const worker = (VPxWorker*)ptr;

   int done = 0;

   while (!done) {

     pthread_mutex_lock(&worker->impl_->mutex_);

@@ -52,8 +52,8 @@

 }

 // main thread state control

-static void change_state(VP9Worker *const worker,

-                         VP9WorkerStatus new_status) {

+static void change_state(VPxWorker *const worker,

+                         VPxWorkerStatus new_status) {

   // No-op when attempting to change state on a thread that didn't come up.

   // Checking status_ without acquiring the lock first would result in a data

   // race.

@@ -78,12 +78,12 @@

 //------------------------------------------------------------------------------

-static void init(VP9Worker *const worker) {

+static void init(VPxWorker *const worker) {

   memset(worker, 0, sizeof(*worker));

   worker->status_ = NOT_OK;

 }

-static int sync(VP9Worker *const worker) {

+static int sync(VPxWorker *const worker) {

 #if CONFIG_MULTITHREAD

   change_state(worker, OK);

 #endif

@@ -91,12 +91,12 @@

   return !worker->had_error;

 }

-static int reset(VP9Worker *const worker) {

+static int reset(VPxWorker *const worker) {

   int ok = 1;

   worker->had_error = 0;

   if (worker->status_ < OK) {

 #if CONFIG_MULTITHREAD

-    worker->impl_ = (VP9WorkerImpl*)vpx_calloc(1, sizeof(*worker->impl_));

+    worker->impl_ = (VPxWorkerImpl*)vpx_calloc(1, sizeof(*worker->impl_));

     if (worker->impl_ == NULL) {

       return 0;

     }

@@ -129,13 +129,13 @@

   return ok;

 }

-static void execute(VP9Worker *const worker) {

+static void execute(VPxWorker *const worker) {

   if (worker->hook != NULL) {

     worker->had_error |= !worker->hook(worker->data1, worker->data2);

   }

 }

-static void launch(VP9Worker *const worker) {

+static void launch(VPxWorker *const worker) {

 #if CONFIG_MULTITHREAD

   change_state(worker, WORK);

 #else

@@ -143,7 +143,7 @@

 #endif

 }

-static void end(VP9Worker *const worker) {

+static void end(VPxWorker *const worker) {

 #if CONFIG_MULTITHREAD

   if (worker->impl_ != NULL) {

     change_state(worker, NOT_OK);

@@ -162,11 +162,11 @@

 //------------------------------------------------------------------------------

-static VP9WorkerInterface g_worker_interface = {

+static VPxWorkerInterface g_worker_interface = {

   init, reset, sync, launch, execute, end

 };

-int vp9_set_worker_interface(const VP9WorkerInterface* const winterface) {

+int vpx_set_worker_interface(const VPxWorkerInterface* const winterface) {

   if (winterface == NULL ||

       winterface->init == NULL || winterface->reset == NULL ||

       winterface->sync == NULL || winterface->launch == NULL ||

@@ -177,7 +177,7 @@

   return 1;

 }

-const VP9WorkerInterface *vp9_get_worker_interface(void) {

+const VPxWorkerInterface *vpx_get_worker_interface(void) {

   return &g_worker_interface;

 }

--- a/vpx_thread/vpx_thread.h

+++ b/vpx_thread/vpx_thread.h

@@ -13,8 +13,8 @@

 //  http://git.chromium.org/webm/libwebp.git

 //  100644 blob 7bd451b124ae3b81596abfbcc823e3cb129d3a38  src/utils/thread.h

-#ifndef VP9_DECODER_VP9_THREAD_H_

-#define VP9_DECODER_VP9_THREAD_H_

+#ifndef VPX_THREAD_H_

+#define VPX_THREAD_H_

 #include "./vpx_config.h"

@@ -160,49 +160,49 @@

   NOT_OK = 0,   // object is unusable

   OK,           // ready to work

   WORK          // busy finishing the current task

-} VP9WorkerStatus;

+} VPxWorkerStatus;

 // Function to be called by the worker thread. Takes two opaque pointers as

 // arguments (data1 and data2), and should return false in case of error.

-typedef int (*VP9WorkerHook)(void*, void*);

+typedef int (*VPxWorkerHook)(void*, void*);

 // Platform-dependent implementation details for the worker.

-typedef struct VP9WorkerImpl VP9WorkerImpl;

+typedef struct VPxWorkerImpl VPxWorkerImpl;

 // Synchronization object used to launch job in the worker thread

 typedef struct {

-  VP9WorkerImpl *impl_;

-  VP9WorkerStatus status_;

-  VP9WorkerHook hook;     // hook to call

+  VPxWorkerImpl *impl_;

+  VPxWorkerStatus status_;

+  VPxWorkerHook hook;     // hook to call

   void *data1;            // first argument passed to 'hook'

   void *data2;            // second argument passed to 'hook'

   int had_error;          // return value of the last call to 'hook'

-} VP9Worker;

+} VPxWorker;

 // The interface for all thread-worker related functions. All these functions

 // must be implemented.

 typedef struct {

   // Must be called first, before any other method.

-  void (*init)(VP9Worker *const worker);

+  void (*init)(VPxWorker *const worker);

   // Must be called to initialize the object and spawn the thread. Re-entrant.

   // Will potentially launch the thread. Returns false in case of error.

-  int (*reset)(VP9Worker *const worker);

+  int (*reset)(VPxWorker *const worker);

   // Makes sure the previous work is finished. Returns true if worker->had_error

   // was not set and no error condition was triggered by the working thread.

-  int (*sync)(VP9Worker *const worker);

+  int (*sync)(VPxWorker *const worker);

   // Triggers the thread to call hook() with data1 and data2 arguments. These

   // hook/data1/data2 values can be changed at any time before calling this

   // function, but not be changed afterward until the next call to Sync().

-  void (*launch)(VP9Worker *const worker);

+  void (*launch)(VPxWorker *const worker);

   // This function is similar to launch() except that it calls the

   // hook directly instead of using a thread. Convenient to bypass the thread

-  // mechanism while still using the VP9Worker structs. sync() must

+  // mechanism while still using the VPxWorker structs. sync() must

   // still be called afterward (for error reporting).

-  void (*execute)(VP9Worker *const worker);

+  void (*execute)(VPxWorker *const worker);

   // Kill the thread and terminate the object. To use the object again, one

   // must call reset() again.

-  void (*end)(VP9Worker *const worker);

-} VP9WorkerInterface;

+  void (*end)(VPxWorker *const worker);

+} VPxWorkerInterface;

 // Install a new set of threading functions, overriding the defaults. This

 // should be done before any workers are started, i.e., before any encoding or

@@ -209,10 +209,10 @@

 // decoding takes place. The contents of the interface struct are copied, it

 // is safe to free the corresponding memory after this call. This function is

 // not thread-safe. Return false in case of invalid pointer or methods.

-int vp9_set_worker_interface(const VP9WorkerInterface *const winterface);

+int vpx_set_worker_interface(const VPxWorkerInterface *const winterface);

 // Retrieve the currently set thread worker interface.

-const VP9WorkerInterface *vp9_get_worker_interface(void);

+const VPxWorkerInterface *vpx_get_worker_interface(void);

 //------------------------------------------------------------------------------

@@ -220,4 +220,4 @@

 }    // extern "C"

 #endif

-#endif  // VP9_DECODER_VP9_THREAD_H_

+#endif  // VPX_THREAD_H_

-- 

⑨