diff options
Diffstat (limited to 'src/libffmpeg/libavcodec/mlib/dsputil_mlib.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/mlib/dsputil_mlib.c | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c b/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c index 278682534..0d56c576e 100644 --- a/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c +++ b/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c @@ -62,7 +62,7 @@ static void add_pixels_clamped_mlib(const DCTELEM *block, uint8_t *pixels, int l /* put block, width 16 pixel, height 8/16 */ -static void put_pixels16_mlib(uint8_t * dest, const uint8_t * ref, +static void put_pixels16_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { switch (height) { @@ -79,7 +79,7 @@ static void put_pixels16_mlib(uint8_t * dest, const uint8_t * ref, } } -static void put_pixels16_x2_mlib(uint8_t * dest, const uint8_t * ref, +static void put_pixels16_x2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { switch (height) { @@ -96,7 +96,7 @@ static void put_pixels16_x2_mlib(uint8_t * dest, const uint8_t * ref, } } -static void put_pixels16_y2_mlib(uint8_t * dest, const uint8_t * ref, +static void put_pixels16_y2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { switch (height) { @@ -132,7 +132,7 @@ static void put_pixels16_xy2_mlib(uint8_t * dest, const uint8_t * ref, /* put block, width 8 pixel, height 4/8/16 */ -static void put_pixels8_mlib(uint8_t * dest, const uint8_t * ref, +static void put_pixels8_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { switch (height) { @@ -153,7 +153,7 @@ static void put_pixels8_mlib(uint8_t * dest, const uint8_t * ref, } } -static void put_pixels8_x2_mlib(uint8_t * dest, const uint8_t * ref, +static void put_pixels8_x2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { switch (height) { @@ -174,7 +174,7 @@ static void put_pixels8_x2_mlib(uint8_t * dest, const uint8_t * ref, } } -static void put_pixels8_y2_mlib(uint8_t * dest, const uint8_t * ref, +static void put_pixels8_y2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { switch (height) { @@ -218,7 +218,7 @@ static void put_pixels8_xy2_mlib(uint8_t * dest, const uint8_t * ref, /* average block, width 16 pixel, height 8/16 */ -static void avg_pixels16_mlib(uint8_t * dest, const uint8_t * ref, +static void avg_pixels16_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { switch (height) { @@ -235,7 +235,7 @@ static void avg_pixels16_mlib(uint8_t * dest, const uint8_t * ref, } } -static void avg_pixels16_x2_mlib(uint8_t * dest, const uint8_t * ref, +static void avg_pixels16_x2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { switch (height) { @@ -252,7 +252,7 @@ static void avg_pixels16_x2_mlib(uint8_t * dest, const uint8_t * ref, } } -static void avg_pixels16_y2_mlib(uint8_t * dest, const uint8_t * ref, +static void avg_pixels16_y2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { switch (height) { @@ -288,7 +288,7 @@ static void avg_pixels16_xy2_mlib(uint8_t * dest, const uint8_t * ref, /* average block, width 8 pixel, height 4/8/16 */ -static void avg_pixels8_mlib(uint8_t * dest, const uint8_t * ref, +static void avg_pixels8_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { switch (height) { @@ -309,7 +309,7 @@ static void avg_pixels8_mlib(uint8_t * dest, const uint8_t * ref, } } -static void avg_pixels8_x2_mlib(uint8_t * dest, const uint8_t * ref, +static void avg_pixels8_x2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { switch (height) { @@ -330,7 +330,7 @@ static void avg_pixels8_x2_mlib(uint8_t * dest, const uint8_t * ref, } } -static void avg_pixels8_y2_mlib(uint8_t * dest, const uint8_t * ref, +static void avg_pixels8_y2_mlib (uint8_t * dest, const uint8_t * ref, int stride, int height) { switch (height) { @@ -386,9 +386,9 @@ static void ff_idct_put_mlib(uint8_t *dest, int line_size, DCTELEM *data) int i; uint8_t *cm = cropTbl + MAX_NEG_CROP; - mlib_VideoIDCT8x8_S16_S16(data, data); + mlib_VideoIDCT8x8_S16_S16 (data, data); - for (i=0;i<8;i++) { + for(i=0;i<8;i++) { dest[0] = cm[data[0]]; dest[1] = cm[data[1]]; dest[2] = cm[data[2]]; @@ -401,22 +401,23 @@ static void ff_idct_put_mlib(uint8_t *dest, int line_size, DCTELEM *data) dest += line_size; data += 8; } + } } static void ff_idct_add_mlib(uint8_t *dest, int line_size, DCTELEM *data) { - mlib_VideoIDCT8x8_S16_S16(data, data); + mlib_VideoIDCT8x8_S16_S16 (data, data); mlib_VideoAddBlock_U8_S16(dest, (mlib_s16 *)data, line_size); } -static void ff_idct_mlib(DCTELEM *data) +static void ff_idct_mlib(uint8_t *dest, int line_size, DCTELEM *data) { - mlib_VideoIDCT8x8_S16_S16(data, data); + mlib_VideoIDCT8x8_S16_S16 (data, data); } static void ff_fdct_mlib(DCTELEM *data) { - mlib_VideoDCT8x8_S16_S16(data, data); + mlib_VideoDCT8x8_S16_S16 (data, data); } void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx) @@ -454,15 +455,15 @@ void dsputil_init_mlib(DSPContext* c, AVCodecContext *avctx) void MPV_common_init_mlib(MpegEncContext *s) { if (xine_mm_accel() & MM_ACCEL_MLIB) { - if ((s->avctx->dct_algo == FF_DCT_AUTO) || (s->avctx->dct_algo==FF_DCT_MLIB)) { + if(s->avctx->dct_algo==FF_DCT_AUTO || s->avctx->dct_algo==FF_DCT_MLIB){ s->dsp.fdct = ff_fdct_mlib; } - if ((s->avctx->idct_algo == FF_IDCT_AUTO) || (s->avctx->idct_algo == FF_IDCT_MLIB)) { - s->dsp.idct = ff_idct_mlib; - s->dsp.idct_put = ff_idct_put_mlib; - s->dsp.idct_add = ff_idct_add_mlib; - s->dsp.idct_permutation_type = FF_NO_IDCT_PERM; + if(s->avctx->idct_algo==FF_IDCT_AUTO || s->avctx->idct_algo==FF_IDCT_MLIB){ + s->dsp.idct_put= ff_idct_put_mlib; + s->dsp.idct_add= ff_idct_add_mlib; + s->dsp.idct = ff_idct_mlib; + s->dsp.idct_permutation_type= FF_NO_IDCT_PERM; } } } |