[vlc-devel] [vlc-commits] commit: Workaround for #3526 (h264 and direct rendering). (Laurent Aimar )

[xxcv]

On 16/05/2010 3:37 AM, git at videolan.org wrote:
> vlc/vlc-1.1 | branch: master | Laurent Aimar<fenrir at videolan.org>  | Sat May 15 19:35:23 2010 +0200| [6970145b15b0ec51a9e4deba187553dbce2aaec4] | committer: Laurent Aimar
>
> Workaround for #3526 (h264 and direct rendering).
>
> The bug is not specific to win32 (x11 has it too). I have to hardcode the
> value for vlc 1.1 but will try to do something cleaner for vlc master.
>
>> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=6970145b15b0ec51a9e4deba187553dbce2aaec4
Hi,
#3526 direct rendering bug is back to haunt you.
[13:48] <DGMurdockIII> http://forum.doom9.org/showthread.php?t=155946
> ---
>
>   include/vlc_config.h            |    2 +-
>   src/video_output/video_output.c |    7 +++----
>   2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/include/vlc_config.h b/include/vlc_config.h
> index 2dfc502..e161f5f 100644
> --- a/include/vlc_config.h
> +++ b/include/vlc_config.h
> @@ -153,7 +153,7 @@
>
>   /* Video heap size - remember that a decompressed picture is big
>    * (~1 Mbyte) before using huge values */
> -#define VOUT_MAX_PICTURES              20
> +#define VOUT_MAX_PICTURES              25
>
>   /*
>    * Time settings
> diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
> index 859bdb4..da6e7b6 100644
> --- a/src/video_output/video_output.c
> +++ b/src/video_output/video_output.c
> @@ -109,10 +109,9 @@ static void DisplayTitleOnOSD( vout_thread_t *p_vout );
>
>   /* Minimum number of direct pictures the video output will accept without
>    * creating additional pictures in system memory */
> -#ifdef OPTIMIZE_MEMORY
> -#   define VOUT_MIN_DIRECT_PICTURES        (VOUT_MAX_PICTURES/2)
> -#else
> -#   define VOUT_MIN_DIRECT_PICTURES        (3*VOUT_MAX_PICTURES/4)
> +#define VOUT_MIN_DIRECT_PICTURES 23
> +#if VOUT_MIN_DIRECT_PICTURES>  VOUT_MAX_PICTURES
> +#   error "VOUT_MAX_PICTURES is incomatible with VOUT_MIN_DIRECT_PICTURES"
>   #endif
>
>   /*****************************************************************************
>
> _______________________________________________
> vlc-commits mailing list
> vlc-commits at videolan.org
> http://mailman.videolan.org/listinfo/vlc-commits
>