Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 17:16:39 +0000 (19:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Apr 2014 17:16:39 +0000 (19:16 +0200)
* commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8':
  x86: Drop some unnecessary YASM ifdefs

Conflicts:
libavfilter/x86/vf_yadif_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/h264chroma_init.c
libavcodec/x86/vorbisdsp_init.c
libavfilter/x86/vf_yadif_init.c
libavresample/x86/audio_mix_init.c

Simple merge
Simple merge
Simple merge
@@@ -35,65 -36,16 +35,63 @@@ void ff_yadif_filter_line_ssse3(void *d
                                  void *next, int w, int prefs,
                                  int mrefs, int parity, int mode);
  
 +void ff_yadif_filter_line_16bit_mmxext(void *dst, void *prev, void *cur,
 +                                       void *next, int w, int prefs,
 +                                       int mrefs, int parity, int mode);
 +void ff_yadif_filter_line_16bit_sse2(void *dst, void *prev, void *cur,
 +                                     void *next, int w, int prefs,
 +                                     int mrefs, int parity, int mode);
 +void ff_yadif_filter_line_16bit_ssse3(void *dst, void *prev, void *cur,
 +                                      void *next, int w, int prefs,
 +                                      int mrefs, int parity, int mode);
 +void ff_yadif_filter_line_16bit_sse4(void *dst, void *prev, void *cur,
 +                                     void *next, int w, int prefs,
 +                                     int mrefs, int parity, int mode);
 +
 +void ff_yadif_filter_line_10bit_mmxext(void *dst, void *prev, void *cur,
 +                                       void *next, int w, int prefs,
 +                                       int mrefs, int parity, int mode);
 +void ff_yadif_filter_line_10bit_sse2(void *dst, void *prev, void *cur,
 +                                     void *next, int w, int prefs,
 +                                     int mrefs, int parity, int mode);
 +void ff_yadif_filter_line_10bit_ssse3(void *dst, void *prev, void *cur,
 +                                      void *next, int w, int prefs,
 +                                      int mrefs, int parity, int mode);
 +
  av_cold void ff_yadif_init_x86(YADIFContext *yadif)
  {
- #if HAVE_YASM
      int cpu_flags = av_get_cpu_flags();
 +    int bit_depth = (!yadif->csp) ? 8
 +                                  : yadif->csp->comp[0].depth_minus1 + 1;
  
 +    if (bit_depth >= 15) {
 +#if ARCH_X86_32
 +        if (EXTERNAL_MMXEXT(cpu_flags))
 +            yadif->filter_line = ff_yadif_filter_line_16bit_mmxext;
 +#endif /* ARCH_X86_32 */
 +        if (EXTERNAL_SSE2(cpu_flags))
 +            yadif->filter_line = ff_yadif_filter_line_16bit_sse2;
 +        if (EXTERNAL_SSSE3(cpu_flags))
 +            yadif->filter_line = ff_yadif_filter_line_16bit_ssse3;
 +        if (EXTERNAL_SSE4(cpu_flags))
 +            yadif->filter_line = ff_yadif_filter_line_16bit_sse4;
 +    } else if ( bit_depth >= 9 && bit_depth <= 14) {
 +#if ARCH_X86_32
 +        if (EXTERNAL_MMXEXT(cpu_flags))
 +            yadif->filter_line = ff_yadif_filter_line_10bit_mmxext;
 +#endif /* ARCH_X86_32 */
 +        if (EXTERNAL_SSE2(cpu_flags))
 +            yadif->filter_line = ff_yadif_filter_line_10bit_sse2;
 +        if (EXTERNAL_SSSE3(cpu_flags))
 +            yadif->filter_line = ff_yadif_filter_line_10bit_ssse3;
 +    } else {
  #if ARCH_X86_32
 -    if (EXTERNAL_MMXEXT(cpu_flags))
 -        yadif->filter_line = ff_yadif_filter_line_mmxext;
 +        if (EXTERNAL_MMXEXT(cpu_flags))
 +            yadif->filter_line = ff_yadif_filter_line_mmxext;
  #endif /* ARCH_X86_32 */
 -    if (EXTERNAL_SSE2(cpu_flags))
 -        yadif->filter_line = ff_yadif_filter_line_sse2;
 -    if (EXTERNAL_SSSE3(cpu_flags))
 -        yadif->filter_line = ff_yadif_filter_line_ssse3;
 +        if (EXTERNAL_SSE2(cpu_flags))
 +            yadif->filter_line = ff_yadif_filter_line_sse2;
 +        if (EXTERNAL_SSSE3(cpu_flags))
 +            yadif->filter_line = ff_yadif_filter_line_ssse3;
 +    }
- #endif /* HAVE_YASM */
  }
Simple merge