[vlc-devel] [PATCH 2/5] android:display: don't lock pictures via the pool

[Thomas Guillem]

I prefer that you don't touch android for now. It's OK to break the VLC4.0 Android build, it is regularly broken and not tested/used by the vlc-android app.

On Mon, Feb 25, 2019, at 15:49, Steve Lhomme wrote:
> Not sure if decoding will still work if the pictures are unlocked by default
> during decoding.
> This pool will probably move in the decoder anyway. The unlock/lock might have
> to be done in the Display() if displaying locked pictures is not possible.
> ---
>  modules/video_output/android/display.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/modules/video_output/android/display.c 
> b/modules/video_output/android/display.c
> index 73767fcd09..e0f45109b0 100644
> --- a/modules/video_output/android/display.c
> +++ b/modules/video_output/android/display.c
> @@ -794,10 +794,8 @@ static picture_pool_t *PoolAlloc(vout_display_t 
> *vd, unsigned requested_count)
>          pp_pics[i] = p_pic;
>      }
>  
> -    picture_pool_configuration_t pool_cfg;
> -    memset(&pool_cfg, 0, sizeof(pool_cfg));
> -    pool_cfg.picture_count = requested_count;
> -    pool_cfg.picture       = pp_pics;
> +#if 0
> +    /* we could do the lock/copy/unlock in Prepare() */
>      if (sys->p_window->b_opaque)
>      {
>          pool_cfg.lock      = PoolLockOpaquePicture;
> @@ -808,7 +806,8 @@ static picture_pool_t *PoolAlloc(vout_display_t 
> *vd, unsigned requested_count)
>          pool_cfg.lock      = PoolLockPicture;
>          pool_cfg.unlock    = PoolUnlockPicture;
>      }
> -    pool = picture_pool_NewExtended(&pool_cfg);
> +#endif
> +    pool = picture_pool_New(requested_count, pp_pics);
>  
>  error:
>      if (!pool && pp_pics) {
> -- 
> 2.17.1
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel