vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Jun 27 16:34:00 2015 +0300| [afcea3a4938ffbf79afadc0a1797c475e460e9dc] | committer: Rémi Denis-Courmont
picture_pool: stop meddling with picture reference counters > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=afcea3a4938ffbf79afadc0a1797c475e460e9dc --- src/misc/picture_pool.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/src/misc/picture_pool.c b/src/misc/picture_pool.c index db390a2..ba49d67 100644 --- a/src/misc/picture_pool.c +++ b/src/misc/picture_pool.c @@ -69,14 +69,8 @@ void picture_pool_Release(picture_pool_t *pool) if (likely(!destroy)) return; - for (unsigned i = 0; i < pool->picture_count; i++) { - picture_t *picture = pool->picture[i]; - picture_priv_t *priv = (picture_priv_t *)picture; - - picture_Release(priv->gc.opaque->picture); - free(priv->gc.opaque); - free(picture); - } + for (unsigned i = 0; i < pool->picture_count; i++) + picture_Release(pool->picture[i]); vlc_mutex_destroy(&pool->lock); free(pool); @@ -89,7 +83,7 @@ static void picture_pool_ReleasePicture(picture_t *picture) picture_pool_t *pool = sys->pool; if (pool->pic_unlock != NULL) - pool->pic_unlock(picture); + pool->pic_unlock(sys->picture); vlc_mutex_lock(&pool->lock); assert(!(pool->available & (1ULL << sys->offset))); @@ -97,6 +91,9 @@ static void picture_pool_ReleasePicture(picture_t *picture) vlc_mutex_unlock(&pool->lock); picture_pool_Release(pool); + + free(sys); + free(picture); } static picture_t *picture_pool_ClonePicture(picture_pool_t *pool, @@ -147,16 +144,8 @@ picture_pool_t *picture_pool_NewExtended(const picture_pool_configuration_t *cfg pool->available = (1ULL << cfg->picture_count) - 1; pool->refs = 1; pool->picture_count = cfg->picture_count; - - for (unsigned i = 0; i < cfg->picture_count; i++) { - picture_t *picture = picture_pool_ClonePicture(pool, cfg->picture[i], i); - if (unlikely(picture == NULL)) - abort(); - - atomic_init(&((picture_priv_t *)picture)->gc.refs, 0); - - pool->picture[i] = picture; - } + memcpy(pool->picture, cfg->picture, + cfg->picture_count * sizeof (picture_t *)); return pool; } @@ -224,7 +213,7 @@ picture_t *picture_pool_Get(picture_pool_t *pool) assert(pool->refs > 0); for (unsigned i = 0; i < pool->picture_count; i++) { - picture_t *picture = pool->picture[i]; + picture_t *picture = pool->picture[i], *clone; if (!(pool->available & (1ULL << i))) continue; @@ -240,10 +229,9 @@ picture_t *picture_pool_Get(picture_pool_t *pool) continue; } - assert(atomic_load(&((picture_priv_t *)picture)->gc.refs) == 0); - atomic_init(&((picture_priv_t *)picture)->gc.refs, 1); - picture->p_next = NULL; - return picture; + clone = picture_pool_ClonePicture(pool, picture, i); + assert(unlikely(clone == NULL) || clone->p_next == NULL); + return clone; } vlc_mutex_unlock(&pool->lock); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
