Mercurial > libavcodec.hg

comparison x86/dsputilenc_mmx.c @ 12499:bc17df45daa3 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Properly add HAVE_YASM around yasmified symbols. Should fix compile error on configurations using --disable-yasm.
author rbultje
date Fri, 17 Sep 2010 03:01:57 +0000
parents c997f09d1e10
children b2d560458a72
comparison
equal deleted inserted replaced
12498:c997f09d1e10 12499:bc17df45daa3
1116 c->pix_sum = pix_sum16_mmx; 1116 c->pix_sum = pix_sum16_mmx;
1117 1117
1118 c->diff_bytes= diff_bytes_mmx; 1118 c->diff_bytes= diff_bytes_mmx;
1119 c->sum_abs_dctelem= sum_abs_dctelem_mmx; 1119 c->sum_abs_dctelem= sum_abs_dctelem_mmx;
1120 1120
1121 #if HAVE_YASM
1121 c->hadamard8_diff[0]= ff_hadamard8_diff16_mmx; 1122 c->hadamard8_diff[0]= ff_hadamard8_diff16_mmx;
1122 c->hadamard8_diff[1]= ff_hadamard8_diff_mmx; 1123 c->hadamard8_diff[1]= ff_hadamard8_diff_mmx;
1124 #endif
1123 1125
1124 c->pix_norm1 = pix_norm1_mmx; 1126 c->pix_norm1 = pix_norm1_mmx;
1125 c->sse[0] = (mm_flags & AV_CPU_FLAG_SSE2) ? ff_sse16_sse2 : sse16_mmx; 1127 c->sse[0] = (HAVE_YASM && mm_flags & AV_CPU_FLAG_SSE2) ? ff_sse16_sse2 : sse16_mmx;
1126 c->sse[1] = sse8_mmx; 1128 c->sse[1] = sse8_mmx;
1127 c->vsad[4]= vsad_intra16_mmx; 1129 c->vsad[4]= vsad_intra16_mmx;
1128 1130
1129 c->nsse[0] = nsse16_mmx; 1131 c->nsse[0] = nsse16_mmx;
1130 c->nsse[1] = nsse8_mmx; 1132 c->nsse[1] = nsse8_mmx;
1140 c->ssd_int8_vs_int16 = ssd_int8_vs_int16_mmx; 1142 c->ssd_int8_vs_int16 = ssd_int8_vs_int16_mmx;
1141 1143
1142 1144
1143 if (mm_flags & AV_CPU_FLAG_MMX2) { 1145 if (mm_flags & AV_CPU_FLAG_MMX2) {
1144 c->sum_abs_dctelem= sum_abs_dctelem_mmx2; 1146 c->sum_abs_dctelem= sum_abs_dctelem_mmx2;
1147 #if HAVE_YASM
1145 c->hadamard8_diff[0]= ff_hadamard8_diff16_mmx2; 1148 c->hadamard8_diff[0]= ff_hadamard8_diff16_mmx2;
1146 c->hadamard8_diff[1]= ff_hadamard8_diff_mmx2; 1149 c->hadamard8_diff[1]= ff_hadamard8_diff_mmx2;
1150 #endif
1147 c->vsad[4]= vsad_intra16_mmx2; 1151 c->vsad[4]= vsad_intra16_mmx2;
1148 1152
1149 if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ 1153 if(!(avctx->flags & CODEC_FLAG_BITEXACT)){
1150 c->vsad[0] = vsad16_mmx2; 1154 c->vsad[0] = vsad16_mmx2;
1151 } 1155 }
1154 } 1158 }
1155 1159
1156 if(mm_flags & AV_CPU_FLAG_SSE2){ 1160 if(mm_flags & AV_CPU_FLAG_SSE2){
1157 c->get_pixels = get_pixels_sse2; 1161 c->get_pixels = get_pixels_sse2;
1158 c->sum_abs_dctelem= sum_abs_dctelem_sse2; 1162 c->sum_abs_dctelem= sum_abs_dctelem_sse2;
1163 #if HAVE_YASM
1159 c->hadamard8_diff[0]= ff_hadamard8_diff16_sse2; 1164 c->hadamard8_diff[0]= ff_hadamard8_diff16_sse2;
1160 c->hadamard8_diff[1]= ff_hadamard8_diff_sse2; 1165 c->hadamard8_diff[1]= ff_hadamard8_diff_sse2;
1166 #endif
1161 } 1167 }
1162 1168
1163 if (CONFIG_LPC && mm_flags & (AV_CPU_FLAG_SSE2|AV_CPU_FLAG_SSE2SLOW)) { 1169 if (CONFIG_LPC && mm_flags & (AV_CPU_FLAG_SSE2|AV_CPU_FLAG_SSE2SLOW)) {
1164 c->lpc_compute_autocorr = ff_lpc_compute_autocorr_sse2; 1170 c->lpc_compute_autocorr = ff_lpc_compute_autocorr_sse2;
1165 } 1171 }
1169 if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ 1175 if(!(avctx->flags & CODEC_FLAG_BITEXACT)){
1170 c->try_8x8basis= try_8x8basis_ssse3; 1176 c->try_8x8basis= try_8x8basis_ssse3;
1171 } 1177 }
1172 c->add_8x8basis= add_8x8basis_ssse3; 1178 c->add_8x8basis= add_8x8basis_ssse3;
1173 c->sum_abs_dctelem= sum_abs_dctelem_ssse3; 1179 c->sum_abs_dctelem= sum_abs_dctelem_ssse3;
1180 #if HAVE_YASM
1174 c->hadamard8_diff[0]= ff_hadamard8_diff16_ssse3; 1181 c->hadamard8_diff[0]= ff_hadamard8_diff16_ssse3;
1175 c->hadamard8_diff[1]= ff_hadamard8_diff_ssse3; 1182 c->hadamard8_diff[1]= ff_hadamard8_diff_ssse3;
1183 #endif
1176 } 1184 }
1177 #endif 1185 #endif
1178 1186
1179 if(mm_flags & AV_CPU_FLAG_3DNOW){ 1187 if(mm_flags & AV_CPU_FLAG_3DNOW){
1180 if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ 1188 if(!(avctx->flags & CODEC_FLAG_BITEXACT)){