* qatar/master: (24 commits) flvdec: remove incomplete, disabled seeking code mem: add support for _aligned_malloc() as found on Windows lavc: Extend the documentation for avcodec_init_packet flvdec: remove incomplete, disabled seeking code http: replace atoll() with strtoll() mpegts: remove unused/incomplete/broken seeking code af_amix: allow float planar sample format as input af_amix: use AVFloatDSPContext.vector_fmac_scalar() float_dsp: add x86-optimized functions for vector_fmac_scalar() float_dsp: Move vector_fmac_scalar() from libavcodec to libavutil lavr: Add x86-optimized function for flt to s32 conversion lavr: Add x86-optimized function for flt to s16 conversion lavr: Add x86-optimized functions for s32 to flt conversion lavr: Add x86-optimized functions for s32 to s16 conversion lavr: Add x86-optimized functions for s16 to flt conversion lavr: Add x86-optimized function for s16 to s32 conversion rtpenc: Support packetizing iLBC rtpdec: Add a depacketizer for iLBC Implement the iLBC storage file format mov: Support muxing/demuxing iLBC ... Conflicts: Changelog configure libavcodec/avcodec.h libavcodec/dsputil.c libavcodec/version.h libavformat/movenc.c libavformat/mpegts.c libavformat/version.h libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			49 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			49 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * This file is part of FFmpeg.
 | |
|  *
 | |
|  * FFmpeg is free software; you can redistribute it and/or
 | |
|  * modify it under the terms of the GNU Lesser General Public
 | |
|  * License as published by the Free Software Foundation; either
 | |
|  * version 2.1 of the License, or (at your option) any later version.
 | |
|  *
 | |
|  * FFmpeg is distributed in the hope that it will be useful,
 | |
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
|  * Lesser General Public License for more details.
 | |
|  *
 | |
|  * You should have received a copy of the GNU Lesser General Public
 | |
|  * License along with FFmpeg; if not, write to the Free Software
 | |
|  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | |
|  */
 | |
| 
 | |
| #include "config.h"
 | |
| 
 | |
| #include "libavutil/cpu.h"
 | |
| #include "libavutil/float_dsp.h"
 | |
| 
 | |
| extern void ff_vector_fmul_sse(float *dst, const float *src0, const float *src1,
 | |
|                                int len);
 | |
| extern void ff_vector_fmul_avx(float *dst, const float *src0, const float *src1,
 | |
|                                int len);
 | |
| 
 | |
| extern void ff_vector_fmac_scalar_sse(float *dst, const float *src, float mul,
 | |
|                                       int len);
 | |
| extern void ff_vector_fmac_scalar_avx(float *dst, const float *src, float mul,
 | |
|                                       int len);
 | |
| 
 | |
| void ff_float_dsp_init_x86(AVFloatDSPContext *fdsp)
 | |
| {
 | |
| #if HAVE_YASM
 | |
|     int mm_flags = av_get_cpu_flags();
 | |
| 
 | |
|     if (mm_flags & AV_CPU_FLAG_SSE && HAVE_SSE) {
 | |
|         fdsp->vector_fmul = ff_vector_fmul_sse;
 | |
|         fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_sse;
 | |
|     }
 | |
|     if (mm_flags & AV_CPU_FLAG_AVX && HAVE_AVX) {
 | |
|         fdsp->vector_fmul = ff_vector_fmul_avx;
 | |
|         fdsp->vector_fmac_scalar = ff_vector_fmac_scalar_avx;
 | |
|     }
 | |
| #endif
 | |
| }
 |