[vlc-devel] [PATCH 7/7] vout: remove picture_pool_Reset()

Rémi Denis-Courmont remi at remlab.net
Sun Jan 15 14:39:54 CET 2017


LGTM

Le mercredi 11 janvier 2017, 09:13:14 Thomas Guillem a écrit :
> ---
>  src/misc/picture_pool.c | 14 --------------
>  src/misc/picture_pool.h | 12 ------------
>  2 files changed, 26 deletions(-)
> 
> diff --git a/src/misc/picture_pool.c b/src/misc/picture_pool.c
> index e7b9d34ac2..affe802be9 100644
> --- a/src/misc/picture_pool.c
> +++ b/src/misc/picture_pool.c
> @@ -297,20 +297,6 @@ void picture_pool_Cancel(picture_pool_t *pool, bool
> canceled) vlc_mutex_unlock(&pool->lock);
>  }
> 
> -unsigned picture_pool_Reset(picture_pool_t *pool)
> -{
> -    unsigned ret;
> -
> -    vlc_mutex_lock(&pool->lock);
> -    assert(pool->refs > 0);
> -    ret = pool->picture_count - popcountll(pool->available);
> -    pool->available = (1ULL << pool->picture_count) - 1;
> -    pool->canceled = false;
> -    vlc_mutex_unlock(&pool->lock);
> -
> -    return ret;
> -}
> -
>  unsigned picture_pool_GetSize(const picture_pool_t *pool)
>  {
>      return pool->picture_count;
> diff --git a/src/misc/picture_pool.h b/src/misc/picture_pool.h
> index 4296970f29..16b92bf3b4 100644
> --- a/src/misc/picture_pool.h
> +++ b/src/misc/picture_pool.h
> @@ -21,18 +21,6 @@
>  #include <vlc_picture_pool.h>
> 
>  /**
> - * Forcefully return all pictures in the pool to free/unallocated state.
> - *
> - * @warning If any picture in the pool is not free, this function will leak
> - * and may eventually cause invalid memory accesses.
> - *
> - * @note This function has no effects if all pictures in the pool are free.
> - *
> - * @return the number of picture references that were freed
> - */
> -unsigned picture_pool_Reset( picture_pool_t * );
> -
> -/**
>   * Cancel the picture pool.
>   *
>   * It won't return any pictures via picture_pool_Get or picture_pool_Wait
> if

-- 
Rémi Denis-Courmont
http://www.remlab.net/



More information about the vlc-devel mailing list