comparison x86/snowdsp_mmx.c @ 12456:a5ddb39627fd libavcodec

Rename FF_MM_ symbols related to CPU features flags as AV_CPU_FLAG_ symbols, and move them from libavcodec/avcodec.h to libavutil/cpu.h.
author stefano
date Sat, 04 Sep 2010 09:59:08 +0000
parents 3fc4c625b6f3
children 9fef0a8ddd63
comparison
equal deleted inserted replaced
12455:14f85520cd02 12456:a5ddb39627fd
17 * You should have received a copy of the GNU Lesser General Public 17 * You should have received a copy of the GNU Lesser General Public
18 * License along with FFmpeg; if not, write to the Free Software 18 * License along with FFmpeg; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */ 20 */
21 21
22 #include "libavutil/cpu.h"
22 #include "libavutil/x86_cpu.h" 23 #include "libavutil/x86_cpu.h"
23 #include "libavcodec/avcodec.h" 24 #include "libavcodec/avcodec.h"
24 #include "libavcodec/snow.h" 25 #include "libavcodec/snow.h"
25 #include "libavcodec/dwt.h" 26 #include "libavcodec/dwt.h"
26 #include "dsputil_mmx.h" 27 #include "dsputil_mmx.h"
874 875
875 void ff_dwt_init_x86(DWTContext *c) 876 void ff_dwt_init_x86(DWTContext *c)
876 { 877 {
877 int mm_flags = mm_support(); 878 int mm_flags = mm_support();
878 879
879 if (mm_flags & FF_MM_MMX) { 880 if (mm_flags & AV_CPU_FLAG_MMX) {
880 if(mm_flags & FF_MM_SSE2 & 0){ 881 if(mm_flags & AV_CPU_FLAG_SSE2 & 0){
881 c->horizontal_compose97i = ff_snow_horizontal_compose97i_sse2; 882 c->horizontal_compose97i = ff_snow_horizontal_compose97i_sse2;
882 #if HAVE_7REGS 883 #if HAVE_7REGS
883 c->vertical_compose97i = ff_snow_vertical_compose97i_sse2; 884 c->vertical_compose97i = ff_snow_vertical_compose97i_sse2;
884 #endif 885 #endif
885 c->inner_add_yblock = ff_snow_inner_add_yblock_sse2; 886 c->inner_add_yblock = ff_snow_inner_add_yblock_sse2;
886 } 887 }
887 else{ 888 else{
888 if(mm_flags & FF_MM_MMX2){ 889 if(mm_flags & AV_CPU_FLAG_MMX2){
889 c->horizontal_compose97i = ff_snow_horizontal_compose97i_mmx; 890 c->horizontal_compose97i = ff_snow_horizontal_compose97i_mmx;
890 #if HAVE_7REGS 891 #if HAVE_7REGS
891 c->vertical_compose97i = ff_snow_vertical_compose97i_mmx; 892 c->vertical_compose97i = ff_snow_vertical_compose97i_mmx;
892 #endif 893 #endif
893 } 894 }