Revision d761f089

View differences:

libavcodec/armv4l/dsputil_arm.c
210 210
    ff_add_pixels_clamped = c->add_pixels_clamped;
211 211

  
212 212
    if (avctx->lowres == 0) {
213
    if(idct_algo == FF_IDCT_AUTO){
213
        if(idct_algo == FF_IDCT_AUTO){
214 214
#if defined(HAVE_IPP)
215
        idct_algo = FF_IDCT_IPP;
215
            idct_algo = FF_IDCT_IPP;
216 216
#elif defined(HAVE_ARMV6)
217
        idct_algo = FF_IDCT_SIMPLEARMV6;
217
            idct_algo = FF_IDCT_SIMPLEARMV6;
218 218
#elif defined(HAVE_ARMV5TE)
219
        idct_algo = FF_IDCT_SIMPLEARMV5TE;
219
            idct_algo = FF_IDCT_SIMPLEARMV5TE;
220 220
#else
221
        idct_algo = FF_IDCT_ARM;
221
            idct_algo = FF_IDCT_ARM;
222 222
#endif
223
    }
223
        }
224 224

  
225
    if(idct_algo==FF_IDCT_ARM){
226
        c->idct_put= j_rev_dct_ARM_put;
227
        c->idct_add= j_rev_dct_ARM_add;
228
        c->idct    = j_rev_dct_ARM;
229
        c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;/* FF_NO_IDCT_PERM */
230
    } else if (idct_algo==FF_IDCT_SIMPLEARM){
231
        c->idct_put= simple_idct_ARM_put;
232
        c->idct_add= simple_idct_ARM_add;
233
        c->idct    = simple_idct_ARM;
234
        c->idct_permutation_type= FF_NO_IDCT_PERM;
225
        if(idct_algo==FF_IDCT_ARM){
226
            c->idct_put= j_rev_dct_ARM_put;
227
            c->idct_add= j_rev_dct_ARM_add;
228
            c->idct    = j_rev_dct_ARM;
229
            c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;/* FF_NO_IDCT_PERM */
230
        } else if (idct_algo==FF_IDCT_SIMPLEARM){
231
            c->idct_put= simple_idct_ARM_put;
232
            c->idct_add= simple_idct_ARM_add;
233
            c->idct    = simple_idct_ARM;
234
            c->idct_permutation_type= FF_NO_IDCT_PERM;
235 235
#ifdef HAVE_ARMV6
236
    } else if (idct_algo==FF_IDCT_SIMPLEARMV6){
237
        c->idct_put= ff_simple_idct_put_armv6;
238
        c->idct_add= ff_simple_idct_add_armv6;
239
        c->idct    = ff_simple_idct_armv6;
240
        c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
236
        } else if (idct_algo==FF_IDCT_SIMPLEARMV6){
237
            c->idct_put= ff_simple_idct_put_armv6;
238
            c->idct_add= ff_simple_idct_add_armv6;
239
            c->idct    = ff_simple_idct_armv6;
240
            c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
241 241
#endif
242 242
#ifdef HAVE_ARMV5TE
243
    } else if (idct_algo==FF_IDCT_SIMPLEARMV5TE){
244
        c->idct_put= simple_idct_put_armv5te;
245
        c->idct_add= simple_idct_add_armv5te;
246
        c->idct    = simple_idct_armv5te;
247
        c->idct_permutation_type = FF_NO_IDCT_PERM;
243
        } else if (idct_algo==FF_IDCT_SIMPLEARMV5TE){
244
            c->idct_put= simple_idct_put_armv5te;
245
            c->idct_add= simple_idct_add_armv5te;
246
            c->idct    = simple_idct_armv5te;
247
            c->idct_permutation_type = FF_NO_IDCT_PERM;
248 248
#endif
249 249
#ifdef HAVE_IPP
250
    } else if (idct_algo==FF_IDCT_IPP){
251
        c->idct_put= simple_idct_ipp_put;
252
        c->idct_add= simple_idct_ipp_add;
253
        c->idct    = simple_idct_ipp;
254
        c->idct_permutation_type= FF_NO_IDCT_PERM;
250
        } else if (idct_algo==FF_IDCT_IPP){
251
            c->idct_put= simple_idct_ipp_put;
252
            c->idct_add= simple_idct_ipp_add;
253
            c->idct    = simple_idct_ipp;
254
            c->idct_permutation_type= FF_NO_IDCT_PERM;
255 255
#endif
256
    }
256
        }
257 257
    }
258 258

  
259 259
    c->put_pixels_tab[0][0] = put_pixels16_arm;

Also available in: Unified diff