[FFmpeg-cvslog] r19454 - trunk/libavcodec/x86/dsputil_mmx.c

[Måns Rullgård]

cehoyos <subversion at mplayerhq.hu> writes:

> Author: cehoyos
> Date: Fri Jul 17 11:07:38 2009
> New Revision: 19454
>
> Log:
> Icc 11.1 still does not align the stack pointer, disable some x264 functions.
>
> Modified:
>    trunk/libavcodec/x86/dsputil_mmx.c
>
> Modified: trunk/libavcodec/x86/dsputil_mmx.c
> ==============================================================================
> --- trunk/libavcodec/x86/dsputil_mmx.c	Fri Jul 17 10:21:43 2009	(r19453)
> +++ trunk/libavcodec/x86/dsputil_mmx.c	Fri Jul 17 11:07:38 2009	(r19454)
> @@ -2991,7 +2991,7 @@ void dsputil_init_mmx(DSPContext* c, AVC
>              c->h264_h_loop_filter_luma_intra = ff_x264_deblock_h_luma_intra_mmxext;
>  #endif
>              if( mm_flags&FF_MM_SSE2 ){
> -#if ARCH_X86_64 || !defined(__ICC) || __ICC > 1100
> +#if ARCH_X86_64 || !defined(__ICC) || __ICC > 1110
>                  c->h264_v_loop_filter_luma = ff_x264_deblock_v_luma_sse2;
>                  c->h264_h_loop_filter_luma = ff_x264_deblock_h_luma_sse2;
>                  c->h264_v_loop_filter_luma_intra = ff_x264_deblock_v_luma_intra_sse2;

I don't like this.  Options I'd prefer:

1. Fix the code to not use buffers on the stack.

2. Add a HAVE_ALIGNED_STACK or similar macro, and set it once for
   known-good compilers.  If icc learns how to align the stack, hunting
   down all instances of code like the above will be time-consuming.

-- 
M?ns Rullg?rd
mans at mansr.com