comparison dsputil.c @ 174:ac5075a55488 libavcodec

new IDCT code by Michael Niedermayer ([e-mail]) - #define SIMPLE_IDCT to enable

173:37eaaa9596cc

 */
#include <stdlib.h>
#include <stdio.h>
#include "avcodec.h"
#include "dsputil.h"

void (*ff_idct)(DCTELEM *block);
void (*get_pixels)(DCTELEM *block, const UINT8 *pixels, int line_size);
void (*put_pixels_clamped)(const DCTELEM *block, UINT8 *pixels, int line_size);
void (*add_pixels_clamped)(const DCTELEM *block, UINT8 *pixels, int line_size);

    return s;
}

/* permute block according so that it corresponds to the MMX idct
   order */
void block_permute(INT16 *block)
{
    int tmp1, tmp2, tmp3, tmp4, tmp5, tmp6;
    int i;

        block[5] = tmp3;
        block[6] = tmp5;
        block += 8;
    }
}

void dsputil_init(void)
{
    int i, j;
    int use_permuted_idct;

    for(i=0;i<512;i++) {
        squareTbl[i] = (i - 256) * (i - 256);
    }

    ff_idct = j_rev_dct;
    get_pixels = get_pixels_c;
    put_pixels_clamped = put_pixels_clamped_c;
    add_pixels_clamped = add_pixels_clamped_c;

    pix_abs16x16 = pix_abs16x16_c;

    dsputil_init_armv4l();
#endif
#ifdef HAVE_MLIB
    dsputil_init_mlib();
    use_permuted_idct = 0;
#endif

    if (use_permuted_idct) {
        /* permute for IDCT */
        for(i=0;i<64;i++) {

174:ac5075a55488

 */
#include <stdlib.h>
#include <stdio.h>
#include "avcodec.h"
#include "dsputil.h"
#include "simple_idct.h"

void (*ff_idct)(DCTELEM *block);
void (*get_pixels)(DCTELEM *block, const UINT8 *pixels, int line_size);
void (*put_pixels_clamped)(const DCTELEM *block, UINT8 *pixels, int line_size);
void (*add_pixels_clamped)(const DCTELEM *block, UINT8 *pixels, int line_size);

    return s;
}

/* permute block according so that it corresponds to the MMX idct
   order */
#ifdef SIMPLE_IDCT
void block_permute(INT16 *block)
{
	int i;
	INT16 temp[64];

//	for(i=0; i<64; i++) temp[i] = block[ block_permute_op(i) ];
	for(i=0; i<64; i++) temp[ block_permute_op(i) ] = block[i];

	for(i=0; i<64; i++) block[i] = temp[i];
/*
	for(i=0; i<64; i++)
	{
		if((i&7)==0) printf("\n");
		printf("%2d ", block[i]);
	}
*/
}

#else

void block_permute(INT16 *block)
{
    int tmp1, tmp2, tmp3, tmp4, tmp5, tmp6;
    int i;

        block[5] = tmp3;
        block[6] = tmp5;
        block += 8;
    }
}
#endif

void dsputil_init(void)
{
    int i, j;
    int use_permuted_idct;

    for(i=0;i<512;i++) {
        squareTbl[i] = (i - 256) * (i - 256);
    }

#ifdef SIMPLE_IDCT
    ff_idct = simple_idct;
#else
    ff_idct = j_rev_dct;
#endif
    get_pixels = get_pixels_c;
    put_pixels_clamped = put_pixels_clamped_c;
    add_pixels_clamped = add_pixels_clamped_c;

    pix_abs16x16 = pix_abs16x16_c;

    dsputil_init_armv4l();
#endif
#ifdef HAVE_MLIB
    dsputil_init_mlib();
    use_permuted_idct = 0;
#endif

#ifdef SIMPLE_IDCT
    if(ff_idct == simple_idct) use_permuted_idct=0;
#endif

    if (use_permuted_idct) {
        /* permute for IDCT */
        for(i=0;i<64;i++) {