shithub: libvpx

--- a/vp9/common/vp9_alloccommon.c

+++ b/vp9/common/vp9_alloccommon.c

@@ -17,24 +17,6 @@

 #include "vp9/common/vp9_entropymv.h"

 #include "vp9/common/vp9_onyxc_int.h"

-// TODO(hkuang): Don't need to lock the whole pool after implementing atomic

-// frame reference count.

-void lock_buffer_pool(BufferPool *const pool) {

-#if CONFIG_MULTITHREAD

-  pthread_mutex_lock(&pool->pool_mutex);

-#else

-  (void)pool;

-#endif

-}

-void unlock_buffer_pool(BufferPool *const pool) {

-#if CONFIG_MULTITHREAD

-  pthread_mutex_unlock(&pool->pool_mutex);

-#else

-  (void)pool;

-#endif

-}

 void vp9_set_mb_mi(VP9_COMMON *cm, int width, int height) {

   const int aligned_width = ALIGN_POWER_OF_TWO(width, MI_SIZE_LOG2);

   const int aligned_height = ALIGN_POWER_OF_TWO(height, MI_SIZE_LOG2);

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

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

@@ -74,13 +74,6 @@

 } RefCntBuffer;

 typedef struct BufferPool {

-// Protect BufferPool from being accessed by several FrameWorkers at

-// the same time during frame parallel decode.

-// TODO(hkuang): Try to use atomic variable instead of locking the whole pool.

-#if CONFIG_MULTITHREAD

-  pthread_mutex_t pool_mutex;

-#endif

   // Private data associated with the frame buffer callbacks.

   void *cb_priv;

@@ -264,11 +257,6 @@

   int above_context_alloc_cols;

 } VP9_COMMON;

-// TODO(hkuang): Don't need to lock the whole pool after implementing atomic

-// frame reference count.

-void lock_buffer_pool(BufferPool *const pool);

-void unlock_buffer_pool(BufferPool *const pool);

 static INLINE YV12_BUFFER_CONFIG *get_ref_frame(VP9_COMMON *cm, int index) {

   if (index < 0 || index >= REF_FRAMES) return NULL;

   if (cm->ref_frame_map[index] < 0) return NULL;

@@ -284,7 +272,6 @@

   RefCntBuffer *const frame_bufs = cm->buffer_pool->frame_bufs;

   int i;

-  lock_buffer_pool(cm->buffer_pool);

   for (i = 0; i < FRAME_BUFFERS; ++i)

     if (frame_bufs[i].ref_count == 0) break;

@@ -295,7 +282,6 @@

     i = INVALID_IDX;

-  unlock_buffer_pool(cm->buffer_pool);

   return i;

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

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

@@ -1171,7 +1171,6 @@

   resize_context_buffers(cm, width, height);

   setup_render_size(cm, rb);

-  lock_buffer_pool(pool);

   if (vpx_realloc_frame_buffer(

           get_frame_new_buffer(cm), cm->width, cm->height, cm->subsampling_x,

           cm->subsampling_y,

@@ -1181,11 +1180,9 @@

           VP9_DEC_BORDER_IN_PIXELS, cm->byte_alignment,

           &pool->frame_bufs[cm->new_fb_idx].raw_frame_buffer, pool->get_fb_cb,

           pool->cb_priv)) {

-    unlock_buffer_pool(pool);

     vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,

                        "Failed to allocate frame buffer");

-  unlock_buffer_pool(pool);

   pool->frame_bufs[cm->new_fb_idx].buf.subsampling_x = cm->subsampling_x;

   pool->frame_bufs[cm->new_fb_idx].buf.subsampling_y = cm->subsampling_y;

@@ -1257,7 +1254,6 @@

   resize_context_buffers(cm, width, height);

   setup_render_size(cm, rb);

-  lock_buffer_pool(pool);

   if (vpx_realloc_frame_buffer(

           get_frame_new_buffer(cm), cm->width, cm->height, cm->subsampling_x,

           cm->subsampling_y,

@@ -1267,11 +1263,9 @@

           VP9_DEC_BORDER_IN_PIXELS, cm->byte_alignment,

           &pool->frame_bufs[cm->new_fb_idx].raw_frame_buffer, pool->get_fb_cb,

           pool->cb_priv)) {

-    unlock_buffer_pool(pool);

     vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,

                        "Failed to allocate frame buffer");

-  unlock_buffer_pool(pool);

   pool->frame_bufs[cm->new_fb_idx].buf.subsampling_x = cm->subsampling_x;

   pool->frame_bufs[cm->new_fb_idx].buf.subsampling_y = cm->subsampling_y;

@@ -1756,9 +1750,7 @@

   if (cm->show_existing_frame) {

     // Show an existing frame directly.

     const int frame_to_show = cm->ref_frame_map[vpx_rb_read_literal(rb, 3)];

-    lock_buffer_pool(pool);

     if (frame_to_show < 0 || frame_bufs[frame_to_show].ref_count < 1) {

-      unlock_buffer_pool(pool);

       vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM,

                          "Buffer %d does not contain a decoded frame",

                          frame_to_show);

@@ -1765,7 +1757,6 @@

     ref_cnt_fb(frame_bufs, &cm->new_fb_idx, frame_to_show);

-    unlock_buffer_pool(pool);

     pbi->refresh_frame_flags = 0;

     cm->lf.filter_level = 0;

     cm->show_frame = 1;

@@ -1886,7 +1877,6 @@

   cm->frame_context_idx = vpx_rb_read_literal(rb, FRAME_CONTEXTS_LOG2);

   // Generate next_ref_frame_map.

-  lock_buffer_pool(pool);

   for (mask = pbi->refresh_frame_flags; mask; mask >>= 1) {

     if (mask & 1) {

       cm->next_ref_frame_map[ref_index] = cm->new_fb_idx;

@@ -1906,7 +1896,6 @@

     if (cm->ref_frame_map[ref_index] >= 0)

       ++frame_bufs[cm->ref_frame_map[ref_index]].ref_count;

-  unlock_buffer_pool(pool);

   pbi->hold_ref_buf = 1;

   if (frame_is_intra_only(cm) || cm->error_resilient_mode)

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

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

@@ -230,7 +230,6 @@

   BufferPool *const pool = cm->buffer_pool;

   RefCntBuffer *const frame_bufs = cm->buffer_pool->frame_bufs;

-  lock_buffer_pool(pool);

   for (mask = pbi->refresh_frame_flags; mask; mask >>= 1) {

     const int old_idx = cm->ref_frame_map[ref_index];

     // Current thread releases the holding of reference frame.

@@ -250,13 +249,10 @@

     decrease_ref_count(old_idx, frame_bufs, pool);

     cm->ref_frame_map[ref_index] = cm->next_ref_frame_map[ref_index];

-  unlock_buffer_pool(pool);

   pbi->hold_ref_buf = 0;

   cm->frame_to_show = get_frame_new_buffer(cm);

-  lock_buffer_pool(pool);

   --frame_bufs[cm->new_fb_idx].ref_count;

-  unlock_buffer_pool(pool);

   // Invalidate these references until the next frame starts.

   for (ref_index = 0; ref_index < 3; ref_index++)

@@ -321,7 +317,6 @@

       winterface->sync(&pbi->tile_workers[i]);

-    lock_buffer_pool(pool);

     // Release all the reference buffers if worker thread is holding them.

     if (pbi->hold_ref_buf == 1) {

       int ref_index = 0, mask;

@@ -346,7 +341,6 @@

     // Release current frame.

     decrease_ref_count(cm->new_fb_idx, frame_bufs, pool);

-    unlock_buffer_pool(pool);

     vpx_clear_system_state();

     return -1;

--- a/vp9/vp9_cx_iface.c

+++ b/vp9/vp9_cx_iface.c

@@ -898,12 +898,6 @@

     priv->buffer_pool = (BufferPool *)vpx_calloc(1, sizeof(BufferPool));

     if (priv->buffer_pool == NULL) return VPX_CODEC_MEM_ERROR;

-#if CONFIG_MULTITHREAD

-    if (pthread_mutex_init(&priv->buffer_pool->pool_mutex, NULL)) {

-      return VPX_CODEC_MEM_ERROR;

-    }

-#endif

     if (ctx->config.enc) {

       // Update the reference to the config structure to an internal copy.

       priv->cfg = *ctx->config.enc;

@@ -935,9 +929,6 @@

 static vpx_codec_err_t encoder_destroy(vpx_codec_alg_priv_t *ctx) {

   free(ctx->cx_data);

   vp9_remove_compressor(ctx->cpi);

-#if CONFIG_MULTITHREAD

-  pthread_mutex_destroy(&ctx->buffer_pool->pool_mutex);

-#endif

   vpx_free(ctx->buffer_pool);

   vpx_free(ctx);

   return VPX_CODEC_OK;

--- a/vp9/vp9_dx_iface.c

+++ b/vp9/vp9_dx_iface.c

@@ -81,9 +81,6 @@

 #endif

       vpx_free(frame_worker_data);

-#if CONFIG_MULTITHREAD

-    pthread_mutex_destroy(&ctx->buffer_pool->pool_mutex);

-#endif

   if (ctx->buffer_pool) {

@@ -295,13 +292,6 @@

   ctx->buffer_pool = (BufferPool *)vpx_calloc(1, sizeof(BufferPool));

   if (ctx->buffer_pool == NULL) return VPX_CODEC_MEM_ERROR;

-#if CONFIG_MULTITHREAD

-  if (pthread_mutex_init(&ctx->buffer_pool->pool_mutex, NULL)) {

-    set_error_detail(ctx, "Failed to allocate buffer pool mutex");

-    return VPX_CODEC_MEM_ERROR;

-  }

-#endif

   ctx->frame_workers = (VPxWorker *)vpx_malloc(ctx->num_frame_workers *

                                                sizeof(*ctx->frame_workers));