Browse Source

swscale: consistent names for arch-specific acceleration functions

tags/n2.1
Diego Biurrun 12 years ago
parent
commit
3aa682f253
6 changed files with 9 additions and 10 deletions
  1. +1
    -1
      libswscale/bfin/swscale_bfin.c
  2. +1
    -1
      libswscale/bfin/yuv2rgb_bfin.c
  3. +1
    -1
      libswscale/ppc/yuv2yuv_altivec.c
  4. +3
    -4
      libswscale/swscale_internal.h
  5. +2
    -2
      libswscale/swscale_unscaled.c
  6. +1
    -1
      libswscale/yuv2rgb.c

+ 1
- 1
libswscale/bfin/swscale_bfin.c View File

@@ -71,7 +71,7 @@ static int yuyvtoyv12_unscaled(SwsContext *c, const uint8_t *src[],
return srcSliceH;
}

void ff_bfin_get_unscaled_swscale(SwsContext *c)
void ff_get_unscaled_swscale_bfin(SwsContext *c)
{
if (c->dstFormat == AV_PIX_FMT_YUV420P && c->srcFormat == AV_PIX_FMT_UYVY422) {
av_log(NULL, AV_LOG_VERBOSE,


+ 1
- 1
libswscale/bfin/yuv2rgb_bfin.c View File

@@ -167,7 +167,7 @@ static int bfin_yuv420_bgr565(SwsContext *c, const uint8_t **in, int *instrides,
outstrides, ff_bfin_yuv2rgb565_line, 0, 565);
}

SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c)
SwsFunc ff_yuv2rgb_init_bfin(SwsContext *c)
{
SwsFunc f;



+ 1
- 1
libswscale/ppc/yuv2yuv_altivec.c View File

@@ -183,7 +183,7 @@ static int yv12touyvy_unscaled_altivec(SwsContext *c, const uint8_t *src[],

#endif /* HAVE_ALTIVEC */

void ff_swscale_get_unscaled_ppc(SwsContext *c)
void ff_get_unscaled_swscale_ppc(SwsContext *c)
{
#if HAVE_ALTIVEC
if ((av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) && !(c->srcW & 15) &&


+ 3
- 4
libswscale/swscale_internal.h View File

@@ -573,8 +573,7 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI
SwsFunc ff_yuv2rgb_init_x86(SwsContext *c);
SwsFunc ff_yuv2rgb_init_vis(SwsContext *c);
SwsFunc ff_yuv2rgb_init_ppc(SwsContext *c);
SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c);
void ff_bfin_get_unscaled_swscale(SwsContext *c);
SwsFunc ff_yuv2rgb_init_bfin(SwsContext *c);

const char *sws_format_name(enum AVPixelFormat format);

@@ -735,8 +734,8 @@ extern const AVClass sws_context_class;
* source and destination formats, bit depths, flags, etc.
*/
void ff_get_unscaled_swscale(SwsContext *c);
void ff_swscale_get_unscaled_ppc(SwsContext *c);
void ff_get_unscaled_swscale_bfin(SwsContext *c);
void ff_get_unscaled_swscale_ppc(SwsContext *c);

/**
* Return function pointer to fastest main scaler path function depending


+ 2
- 2
libswscale/swscale_unscaled.c View File

@@ -1090,9 +1090,9 @@ void ff_get_unscaled_swscale(SwsContext *c)
}

if (ARCH_BFIN)
ff_bfin_get_unscaled_swscale(c);
ff_get_unscaled_swscale_bfin(c);
if (ARCH_PPC)
ff_swscale_get_unscaled_ppc(c);
ff_get_unscaled_swscale_ppc(c);
}

static void reset_ptr(const uint8_t *src[], int format)


+ 1
- 1
libswscale/yuv2rgb.c View File

@@ -565,7 +565,7 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
else if (HAVE_VIS)
t = ff_yuv2rgb_init_vis(c);
else if (ARCH_BFIN)
t = ff_yuv2rgb_get_func_ptr_bfin(c);
t = ff_yuv2rgb_init_bfin(c);
else if (ARCH_PPC)
t = ff_yuv2rgb_init_ppc(c);



Loading…
Cancel
Save