Mercurial > libavcodec.hg

comparison x86/h264_intrapred_init.c @ 12456:a5ddb39627fd libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 33ecda76b2f2
children 9fef0a8ddd63
comparison
equal deleted inserted replaced
12455:14f85520cd02 12456:a5ddb39627fd
49 void ff_h264_pred_init_x86(H264PredContext *h, int codec_id) 49 void ff_h264_pred_init_x86(H264PredContext *h, int codec_id)
50 { 50 {
51 int mm_flags = mm_support(); 51 int mm_flags = mm_support();
52 52
53 #if HAVE_YASM 53 #if HAVE_YASM
54 if (mm_flags & FF_MM_MMX) { 54 if (mm_flags & AV_CPU_FLAG_MMX) {
55 h->pred16x16[VERT_PRED8x8] = ff_pred16x16_vertical_mmx; 55 h->pred16x16[VERT_PRED8x8] = ff_pred16x16_vertical_mmx;
56 h->pred16x16[HOR_PRED8x8 ] = ff_pred16x16_horizontal_mmx; 56 h->pred16x16[HOR_PRED8x8 ] = ff_pred16x16_horizontal_mmx;
57 h->pred8x8 [VERT_PRED8x8] = ff_pred8x8_vertical_mmx; 57 h->pred8x8 [VERT_PRED8x8] = ff_pred8x8_vertical_mmx;
58 h->pred8x8 [HOR_PRED8x8 ] = ff_pred8x8_horizontal_mmx; 58 h->pred8x8 [HOR_PRED8x8 ] = ff_pred8x8_horizontal_mmx;
59 if (codec_id == CODEC_ID_VP8) { 59 if (codec_id == CODEC_ID_VP8) {
61 h->pred8x8 [PLANE_PRED8x8] = ff_pred8x8_tm_vp8_mmx; 61 h->pred8x8 [PLANE_PRED8x8] = ff_pred8x8_tm_vp8_mmx;
62 h->pred4x4 [TM_VP8_PRED ] = ff_pred4x4_tm_vp8_mmx; 62 h->pred4x4 [TM_VP8_PRED ] = ff_pred4x4_tm_vp8_mmx;
63 } 63 }
64 } 64 }
65 65
66 if (mm_flags & FF_MM_MMX2) { 66 if (mm_flags & AV_CPU_FLAG_MMX2) {
67 h->pred16x16[HOR_PRED8x8 ] = ff_pred16x16_horizontal_mmxext; 67 h->pred16x16[HOR_PRED8x8 ] = ff_pred16x16_horizontal_mmxext;
68 h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_mmxext; 68 h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_mmxext;
69 h->pred8x8 [HOR_PRED8x8 ] = ff_pred8x8_horizontal_mmxext; 69 h->pred8x8 [HOR_PRED8x8 ] = ff_pred8x8_horizontal_mmxext;
70 h->pred4x4 [DC_PRED ] = ff_pred4x4_dc_mmxext; 70 h->pred4x4 [DC_PRED ] = ff_pred4x4_dc_mmxext;
71 if (codec_id == CODEC_ID_VP8) { 71 if (codec_id == CODEC_ID_VP8) {
75 h->pred4x4 [TM_VP8_PRED ] = ff_pred4x4_tm_vp8_mmxext; 75 h->pred4x4 [TM_VP8_PRED ] = ff_pred4x4_tm_vp8_mmxext;
76 h->pred4x4 [VERT_PRED ] = ff_pred4x4_vertical_vp8_mmxext; 76 h->pred4x4 [VERT_PRED ] = ff_pred4x4_vertical_vp8_mmxext;
77 } 77 }
78 } 78 }
79 79
80 if (mm_flags & FF_MM_SSE) { 80 if (mm_flags & AV_CPU_FLAG_SSE) {
81 h->pred16x16[VERT_PRED8x8] = ff_pred16x16_vertical_sse; 81 h->pred16x16[VERT_PRED8x8] = ff_pred16x16_vertical_sse;
82 } 82 }
83 83
84 if (mm_flags & FF_MM_SSE2) { 84 if (mm_flags & AV_CPU_FLAG_SSE2) {
85 h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_sse2; 85 h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_sse2;
86 if (codec_id == CODEC_ID_VP8) { 86 if (codec_id == CODEC_ID_VP8) {
87 h->pred16x16[PLANE_PRED8x8] = ff_pred16x16_tm_vp8_sse2; 87 h->pred16x16[PLANE_PRED8x8] = ff_pred16x16_tm_vp8_sse2;
88 h->pred8x8 [PLANE_PRED8x8] = ff_pred8x8_tm_vp8_sse2; 88 h->pred8x8 [PLANE_PRED8x8] = ff_pred8x8_tm_vp8_sse2;
89 } 89 }
90 } 90 }
91 91
92 if (mm_flags & FF_MM_SSSE3) { 92 if (mm_flags & AV_CPU_FLAG_SSSE3) {
93 h->pred16x16[HOR_PRED8x8 ] = ff_pred16x16_horizontal_ssse3; 93 h->pred16x16[HOR_PRED8x8 ] = ff_pred16x16_horizontal_ssse3;
94 h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_ssse3; 94 h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_ssse3;
95 h->pred8x8 [HOR_PRED8x8 ] = ff_pred8x8_horizontal_ssse3; 95 h->pred8x8 [HOR_PRED8x8 ] = ff_pred8x8_horizontal_ssse3;
96 if (codec_id == CODEC_ID_VP8) { 96 if (codec_id == CODEC_ID_VP8) {
97 h->pred8x8 [PLANE_PRED8x8] = ff_pred8x8_tm_vp8_ssse3; 97 h->pred8x8 [PLANE_PRED8x8] = ff_pred8x8_tm_vp8_ssse3;