* commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415': x86: h264_chromamc_10bit: drop pointless PAVG %define x86: mmx2 ---> mmxext in function names swscale: do not forget to swap data in formats with different endianness Conflicts: libavcodec/x86/dsputil_mmx.c libavfilter/x86/gradfun.c libswscale/input.c libswscale/utils.c libswscale/x86/swscale.c tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			102 lines
		
	
	
		
			4.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			102 lines
		
	
	
		
			4.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright (C) 2010 David Conrad
 | |
|  *
 | |
|  * 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 "dsputil_mmx.h"
 | |
| #include "diracdsp_mmx.h"
 | |
| 
 | |
| void ff_put_rect_clamped_mmx(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height);
 | |
| void ff_put_rect_clamped_sse2(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height);
 | |
| void ff_put_signed_rect_clamped_mmx(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height);
 | |
| void ff_put_signed_rect_clamped_sse2(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height);
 | |
| 
 | |
| #define HPEL_FILTER(MMSIZE, EXT)                                                             \
 | |
|     void ff_dirac_hpel_filter_v_ ## EXT(uint8_t *, const uint8_t *, int, int);               \
 | |
|     void ff_dirac_hpel_filter_h_ ## EXT(uint8_t *, const uint8_t *, int);                    \
 | |
|                                                                                              \
 | |
|     static void dirac_hpel_filter_ ## EXT(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc,       \
 | |
|                                           const uint8_t *src, int stride, int width, int height)   \
 | |
|     {                                                                                        \
 | |
|         while( height-- )                                                                    \
 | |
|         {                                                                                    \
 | |
|             ff_dirac_hpel_filter_v_ ## EXT(dstv-MMSIZE, src-MMSIZE, stride, width+MMSIZE+5); \
 | |
|             ff_dirac_hpel_filter_h_ ## EXT(dsth, src, width);                                \
 | |
|             ff_dirac_hpel_filter_h_ ## EXT(dstc, dstv, width);                               \
 | |
|                                                                                              \
 | |
|             dsth += stride;                                                                  \
 | |
|             dstv += stride;                                                                  \
 | |
|             dstc += stride;                                                                  \
 | |
|             src  += stride;                                                                  \
 | |
|         }                                                                                    \
 | |
|     }
 | |
| 
 | |
| #if !ARCH_X86_64
 | |
| HPEL_FILTER(8, mmx)
 | |
| #endif
 | |
| HPEL_FILTER(16, sse2)
 | |
| 
 | |
| #define PIXFUNC(PFX, IDX, EXT)                                                   \
 | |
|     /*MMXDISABLEDc->PFX ## _dirac_pixels_tab[0][IDX] = ff_ ## PFX ## _dirac_pixels8_ ## EXT;*/  \
 | |
|     c->PFX ## _dirac_pixels_tab[1][IDX] = ff_ ## PFX ## _dirac_pixels16_ ## EXT; \
 | |
|     c->PFX ## _dirac_pixels_tab[2][IDX] = ff_ ## PFX ## _dirac_pixels32_ ## EXT
 | |
| 
 | |
| void ff_diracdsp_init_mmx(DiracDSPContext* c)
 | |
| {
 | |
|     int mm_flags = av_get_cpu_flags();
 | |
| 
 | |
| #if HAVE_YASM
 | |
|     c->add_dirac_obmc[0] = ff_add_dirac_obmc8_mmx;
 | |
| #if !ARCH_X86_64
 | |
|     c->add_dirac_obmc[1] = ff_add_dirac_obmc16_mmx;
 | |
|     c->add_dirac_obmc[2] = ff_add_dirac_obmc32_mmx;
 | |
|     c->dirac_hpel_filter = dirac_hpel_filter_mmx;
 | |
|     c->add_rect_clamped = ff_add_rect_clamped_mmx;
 | |
|     c->put_signed_rect_clamped = ff_put_signed_rect_clamped_mmx;
 | |
| #endif
 | |
| #endif
 | |
| 
 | |
| #if HAVE_MMX_INLINE
 | |
|     PIXFUNC(put, 0, mmx);
 | |
|     PIXFUNC(avg, 0, mmx);
 | |
| #endif
 | |
| 
 | |
| #if HAVE_MMXEXT_INLINE
 | |
|     if (mm_flags & AV_CPU_FLAG_MMX2) {
 | |
|         PIXFUNC(avg, 0, mmxext);
 | |
|     }
 | |
| #endif
 | |
| 
 | |
|     if (mm_flags & AV_CPU_FLAG_SSE2) {
 | |
| #if HAVE_YASM
 | |
|         c->dirac_hpel_filter = dirac_hpel_filter_sse2;
 | |
|         c->add_rect_clamped = ff_add_rect_clamped_sse2;
 | |
|         c->put_signed_rect_clamped = ff_put_signed_rect_clamped_sse2;
 | |
| 
 | |
|         c->add_dirac_obmc[1] = ff_add_dirac_obmc16_sse2;
 | |
|         c->add_dirac_obmc[2] = ff_add_dirac_obmc32_sse2;
 | |
| #endif
 | |
| #if HAVE_SSE2_INLINE
 | |
|         c->put_dirac_pixels_tab[1][0] = ff_put_dirac_pixels16_sse2;
 | |
|         c->avg_dirac_pixels_tab[1][0] = ff_avg_dirac_pixels16_sse2;
 | |
|         c->put_dirac_pixels_tab[2][0] = ff_put_dirac_pixels32_sse2;
 | |
|         c->avg_dirac_pixels_tab[2][0] = ff_avg_dirac_pixels32_sse2;
 | |
| #endif
 | |
|     }
 | |
| }
 |