har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '3aa682f25324d811ec284edc808eb71a46eae950'

Browse Source 
* commit '3aa682f25324d811ec284edc808eb71a46eae950':
  swscale: consistent names for arch-specific acceleration functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-29 15:41:00 +02:00
commit c5cec9a42b
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libswscale/bfin/swscale_bfin.c
View File

@ -71,7 +71,7 @@ static int yuyvtoyv12_unscaled(SwsContext *c, const uint8_t *src[],
return srcSliceH; 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) { if (c->dstFormat == AV_PIX_FMT_YUV420P && c->srcFormat == AV_PIX_FMT_UYVY422) {
av_log(NULL, AV_LOG_VERBOSE, av_log(NULL, AV_LOG_VERBOSE,

2
libswscale/bfin/yuv2rgb_bfin.c
View File

@ -168,7 +168,7 @@ static int bfin_yuv420_bgr565(SwsContext *c, const uint8_t **in, int *instrides,
outstrides, ff_bfin_yuv2rgb565_line, 0, 565); 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; SwsFunc f;

2
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 */ #endif /* HAVE_ALTIVEC */
void ff_swscale_get_unscaled_ppc(SwsContext *c) void ff_get_unscaled_swscale_ppc(SwsContext *c)
{ {
#if HAVE_ALTIVEC #if HAVE_ALTIVEC
if ((av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) && !(c->srcW & 15) && if ((av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) && !(c->srcW & 15) &&

7
libswscale/swscale_internal.h
View File

@ -619,8 +619,7 @@ void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufI
SwsFunc ff_yuv2rgb_init_x86(SwsContext *c); SwsFunc ff_yuv2rgb_init_x86(SwsContext *c);
SwsFunc ff_yuv2rgb_init_vis(SwsContext *c); SwsFunc ff_yuv2rgb_init_vis(SwsContext *c);
SwsFunc ff_yuv2rgb_init_ppc(SwsContext *c); SwsFunc ff_yuv2rgb_init_ppc(SwsContext *c);
SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c); SwsFunc ff_yuv2rgb_init_bfin(SwsContext *c);
void ff_bfin_get_unscaled_swscale(SwsContext *c);
#if FF_API_SWS_FORMAT_NAME #if FF_API_SWS_FORMAT_NAME
/** /**
@ -832,8 +831,8 @@ extern const AVClass sws_context_class;
* source and destination formats, bit depths, flags, etc. * source and destination formats, bit depths, flags, etc.
*/ */
void ff_get_unscaled_swscale(SwsContext *c); void ff_get_unscaled_swscale(SwsContext *c);
void ff_get_unscaled_swscale_bfin(SwsContext *c);
void ff_swscale_get_unscaled_ppc(SwsContext *c); void ff_get_unscaled_swscale_ppc(SwsContext *c);
/** /**
* Return function pointer to fastest main scaler path function depending * Return function pointer to fastest main scaler path function depending

4
libswscale/swscale_unscaled.c
View File

@ -1319,9 +1319,9 @@ void ff_get_unscaled_swscale(SwsContext *c)
} }
if (ARCH_BFIN) if (ARCH_BFIN)
ff_bfin_get_unscaled_swscale(c); ff_get_unscaled_swscale_bfin(c);
if (ARCH_PPC) if (ARCH_PPC)
ff_swscale_get_unscaled_ppc(c); ff_get_unscaled_swscale_ppc(c);
} }
/* Convert the palette to the same packed 32-bit format as the palette */ /* Convert the palette to the same packed 32-bit format as the palette */

2
libswscale/yuv2rgb.c
View File

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