Mercurial > libavcodec.hg

comparison armv4l/dsputil_arm.c @ 6180:a15900739a31 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix indentation that was messed up by r11628
author gpoirier
date Sun, 27 Jan 2008 08:37:28 +0000
parents bdcb17652343
children e6a7be7d85f2
comparison
equal deleted inserted replaced
6179:bdcb17652343 6180:a15900739a31
208 208
209 ff_put_pixels_clamped = c->put_pixels_clamped; 209 ff_put_pixels_clamped = c->put_pixels_clamped;
210 ff_add_pixels_clamped = c->add_pixels_clamped; 210 ff_add_pixels_clamped = c->add_pixels_clamped;
211 211
212 if (avctx->lowres == 0) { 212 if (avctx->lowres == 0) {
213 if(idct_algo == FF_IDCT_AUTO){ 213 if(idct_algo == FF_IDCT_AUTO){
214 #if defined(HAVE_IPP) 214 #if defined(HAVE_IPP)
215 idct_algo = FF_IDCT_IPP; 215 idct_algo = FF_IDCT_IPP;
216 #elif defined(HAVE_ARMV6) 216 #elif defined(HAVE_ARMV6)
217 idct_algo = FF_IDCT_SIMPLEARMV6; 217 idct_algo = FF_IDCT_SIMPLEARMV6;
218 #elif defined(HAVE_ARMV5TE) 218 #elif defined(HAVE_ARMV5TE)
219 idct_algo = FF_IDCT_SIMPLEARMV5TE; 219 idct_algo = FF_IDCT_SIMPLEARMV5TE;
220 #else 220 #else
221 idct_algo = FF_IDCT_ARM; 221 idct_algo = FF_IDCT_ARM;
222 #endif 222 #endif
223 } 223 }
224 224
225 if(idct_algo==FF_IDCT_ARM){ 225 if(idct_algo==FF_IDCT_ARM){
226 c->idct_put= j_rev_dct_ARM_put; 226 c->idct_put= j_rev_dct_ARM_put;
227 c->idct_add= j_rev_dct_ARM_add; 227 c->idct_add= j_rev_dct_ARM_add;
228 c->idct = j_rev_dct_ARM; 228 c->idct = j_rev_dct_ARM;
229 c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;/* FF_NO_IDCT_PERM */ 229 c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;/* FF_NO_IDCT_PERM */
230 } else if (idct_algo==FF_IDCT_SIMPLEARM){ 230 } else if (idct_algo==FF_IDCT_SIMPLEARM){
231 c->idct_put= simple_idct_ARM_put; 231 c->idct_put= simple_idct_ARM_put;
232 c->idct_add= simple_idct_ARM_add; 232 c->idct_add= simple_idct_ARM_add;
233 c->idct = simple_idct_ARM; 233 c->idct = simple_idct_ARM;
234 c->idct_permutation_type= FF_NO_IDCT_PERM; 234 c->idct_permutation_type= FF_NO_IDCT_PERM;
235 #ifdef HAVE_ARMV6 235 #ifdef HAVE_ARMV6
236 } else if (idct_algo==FF_IDCT_SIMPLEARMV6){ 236 } else if (idct_algo==FF_IDCT_SIMPLEARMV6){
237 c->idct_put= ff_simple_idct_put_armv6; 237 c->idct_put= ff_simple_idct_put_armv6;
238 c->idct_add= ff_simple_idct_add_armv6; 238 c->idct_add= ff_simple_idct_add_armv6;
239 c->idct = ff_simple_idct_armv6; 239 c->idct = ff_simple_idct_armv6;
240 c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; 240 c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
241 #endif 241 #endif
242 #ifdef HAVE_ARMV5TE 242 #ifdef HAVE_ARMV5TE
243 } else if (idct_algo==FF_IDCT_SIMPLEARMV5TE){ 243 } else if (idct_algo==FF_IDCT_SIMPLEARMV5TE){
244 c->idct_put= simple_idct_put_armv5te; 244 c->idct_put= simple_idct_put_armv5te;
245 c->idct_add= simple_idct_add_armv5te; 245 c->idct_add= simple_idct_add_armv5te;
246 c->idct = simple_idct_armv5te; 246 c->idct = simple_idct_armv5te;
247 c->idct_permutation_type = FF_NO_IDCT_PERM; 247 c->idct_permutation_type = FF_NO_IDCT_PERM;
248 #endif 248 #endif
249 #ifdef HAVE_IPP 249 #ifdef HAVE_IPP
250 } else if (idct_algo==FF_IDCT_IPP){ 250 } else if (idct_algo==FF_IDCT_IPP){
251 c->idct_put= simple_idct_ipp_put; 251 c->idct_put= simple_idct_ipp_put;
252 c->idct_add= simple_idct_ipp_add; 252 c->idct_add= simple_idct_ipp_add;
253 c->idct = simple_idct_ipp; 253 c->idct = simple_idct_ipp;
254 c->idct_permutation_type= FF_NO_IDCT_PERM; 254 c->idct_permutation_type= FF_NO_IDCT_PERM;
255 #endif 255 #endif
256 } 256 }
257 } 257 }
258 258
259 c->put_pixels_tab[0][0] = put_pixels16_arm; 259 c->put_pixels_tab[0][0] = put_pixels16_arm;
260 c->put_pixels_tab[0][1] = put_pixels16_x2_arm; //OK! 260 c->put_pixels_tab[0][1] = put_pixels16_x2_arm; //OK!
261 c->put_pixels_tab[0][2] = put_pixels16_y2_arm; //OK! 261 c->put_pixels_tab[0][2] = put_pixels16_y2_arm; //OK!