From 1909f6b1b6da2db371c179bed5a19aaf979b7557 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 25 Aug 2013 17:30:05 +0200 Subject: swscale: cosmetics: Drop silly camelCase from swScale function pointer name --- libswscale/bfin/swscale_bfin.c | 4 ++-- libswscale/ppc/yuv2yuv_altivec.c | 4 ++-- libswscale/swscale.c | 10 +++++----- libswscale/swscale_internal.h | 6 +++--- libswscale/swscale_unscaled.c | 42 ++++++++++++++++++++-------------------- libswscale/utils.c | 4 ++-- 6 files changed, 35 insertions(+), 35 deletions(-) (limited to 'libswscale') diff --git a/libswscale/bfin/swscale_bfin.c b/libswscale/bfin/swscale_bfin.c index 99bbfe4577..43c23b4606 100644 --- a/libswscale/bfin/swscale_bfin.c +++ b/libswscale/bfin/swscale_bfin.c @@ -77,11 +77,11 @@ av_cold 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, "selecting Blackfin optimized uyvytoyv12_unscaled\n"); - c->swScale = uyvytoyv12_unscaled; + c->swscale = uyvytoyv12_unscaled; } if (c->dstFormat == AV_PIX_FMT_YUV420P && c->srcFormat == AV_PIX_FMT_YUYV422) { av_log(NULL, AV_LOG_VERBOSE, "selecting Blackfin optimized yuyvtoyv12_unscaled\n"); - c->swScale = yuyvtoyv12_unscaled; + c->swscale = yuyvtoyv12_unscaled; } } diff --git a/libswscale/ppc/yuv2yuv_altivec.c b/libswscale/ppc/yuv2yuv_altivec.c index 1d332ae724..3d483914c6 100644 --- a/libswscale/ppc/yuv2yuv_altivec.c +++ b/libswscale/ppc/yuv2yuv_altivec.c @@ -193,9 +193,9 @@ av_cold void ff_get_unscaled_swscale_ppc(SwsContext *c) // unscaled YV12 -> packed YUV, we want speed if (dstFormat == AV_PIX_FMT_YUYV422) - c->swScale = yv12toyuy2_unscaled_altivec; + c->swscale = yv12toyuy2_unscaled_altivec; else if (dstFormat == AV_PIX_FMT_UYVY422) - c->swScale = yv12touyvy_unscaled_altivec; + c->swscale = yv12touyvy_unscaled_altivec; } #endif /* HAVE_ALTIVEC */ } diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 1a34a902f1..7756e1b52e 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -337,7 +337,7 @@ static av_always_inline void hcscale(SwsContext *c, int16_t *dst1, if (DEBUG_SWSCALE_BUFFERS) \ av_log(c, AV_LOG_DEBUG, __VA_ARGS__) -static int swScale(SwsContext *c, const uint8_t *src[], +static int swscale(SwsContext *c, const uint8_t *src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]) { @@ -407,7 +407,7 @@ static int swScale(SwsContext *c, const uint8_t *src[], srcStride[1] <<= c->vChrDrop; srcStride[2] <<= c->vChrDrop; - DEBUG_BUFFERS("swScale() %p[%d] %p[%d] %p[%d] %p[%d] -> %p[%d] %p[%d] %p[%d] %p[%d]\n", + DEBUG_BUFFERS("swscale() %p[%d] %p[%d] %p[%d] %p[%d] -> %p[%d] %p[%d] %p[%d] %p[%d]\n", src[0], srcStride[0], src[1], srcStride[1], src[2], srcStride[2], src[3], srcStride[3], dst[0], dstStride[0], dst[1], dstStride[1], @@ -718,7 +718,7 @@ static int swScale(SwsContext *c, const uint8_t *src[], return dstY - lastDstY; } -static av_cold void sws_init_swScale_c(SwsContext *c) +static av_cold void sws_init_swscale(SwsContext *c) { enum AVPixelFormat srcFormat = c->srcFormat; @@ -770,12 +770,12 @@ static av_cold void sws_init_swScale_c(SwsContext *c) SwsFunc ff_getSwsFunc(SwsContext *c) { - sws_init_swScale_c(c); + sws_init_swscale(c); if (ARCH_PPC) ff_sws_init_swscale_ppc(c); if (ARCH_X86) ff_sws_init_swscale_x86(c); - return swScale; + return swscale; } diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 6129893f82..5737724c96 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -263,7 +263,7 @@ typedef struct SwsContext { * Note that src, dst, srcStride, dstStride will be copied in the * sws_scale() wrapper so they can be freely modified here. */ - SwsFunc swScale; + SwsFunc swscale; int srcW; ///< Width of source luma/alpha planes. int srcH; ///< Height of source luma/alpha planes. int dstH; ///< Height of destination luma/alpha planes. @@ -454,7 +454,7 @@ typedef struct SwsContext { DECLARE_ALIGNED(8, uint64_t, sparc_coeffs)[10]; #endif - /* function pointers for swScale() */ + /* function pointers for swscale() */ yuv2planar1_fn yuv2plane1; yuv2planarX_fn yuv2planeX; yuv2interleavedX_fn yuv2nv12cX; @@ -730,7 +730,7 @@ extern const int32_t ff_yuv2rgb_coeffs[8][4]; extern const AVClass sws_context_class; /** - * Set c->swScale to an unscaled converter if one exists for the specific + * Set c->swscale to an unscaled converter if one exists for the specific * source and destination formats, bit depths, flags, etc. */ void ff_get_unscaled_swscale(SwsContext *c); diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 7333d5fd0b..3e5f49efeb 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -979,31 +979,31 @@ void ff_get_unscaled_swscale(SwsContext *c) /* yv12_to_nv12 */ if ((srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUVA420P) && (dstFormat == AV_PIX_FMT_NV12 || dstFormat == AV_PIX_FMT_NV21)) { - c->swScale = planarToNv12Wrapper; + c->swscale = planarToNv12Wrapper; } /* yuv2bgr */ if ((srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUV422P || srcFormat == AV_PIX_FMT_YUVA420P) && isAnyRGB(dstFormat) && !(flags & SWS_ACCURATE_RND) && !(dstH & 1)) { - c->swScale = ff_yuv2rgb_get_func_ptr(c); + c->swscale = ff_yuv2rgb_get_func_ptr(c); } if (srcFormat == AV_PIX_FMT_YUV410P && (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P) && !(flags & SWS_BITEXACT)) { - c->swScale = yvu9ToYv12Wrapper; + c->swscale = yvu9ToYv12Wrapper; } /* bgr24toYV12 */ if (srcFormat == AV_PIX_FMT_BGR24 && (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P) && !(flags & SWS_ACCURATE_RND)) - c->swScale = bgr24ToYv12Wrapper; + c->swscale = bgr24ToYv12Wrapper; /* RGB/BGR -> RGB/BGR (no dither needed forms) */ if (isAnyRGB(srcFormat) && isAnyRGB(dstFormat) && findRgbConvFn(c) && (!needsDither || (c->flags&(SWS_FAST_BILINEAR|SWS_POINT)))) - c->swScale= rgbToRgbWrapper; + c->swscale = rgbToRgbWrapper; #define isByteRGB(f) ( \ f == AV_PIX_FMT_RGB32 || \ @@ -1014,11 +1014,11 @@ void ff_get_unscaled_swscale(SwsContext *c) f == AV_PIX_FMT_BGR24) if (srcFormat == AV_PIX_FMT_GBRP && isPlanar(srcFormat) && isByteRGB(dstFormat)) - c->swScale = planarRgbToRgbWrapper; + c->swscale = planarRgbToRgbWrapper; if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth_minus1 == 7 && isPackedRGB(srcFormat) && dstFormat == AV_PIX_FMT_GBRP) - c->swScale = rgbToPlanarRgbWrapper; + c->swscale = rgbToPlanarRgbWrapper; /* bswap 16 bits per pixel/component packed formats */ if (IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR444) || @@ -1031,7 +1031,7 @@ void ff_get_unscaled_swscale(SwsContext *c) IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB555) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB565) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_XYZ12)) - c->swScale = packed_16bpc_bswap; + c->swscale = packed_16bpc_bswap; if ((usePal(srcFormat) && ( dstFormat == AV_PIX_FMT_RGB32 || @@ -1040,13 +1040,13 @@ void ff_get_unscaled_swscale(SwsContext *c) dstFormat == AV_PIX_FMT_BGR32 || dstFormat == AV_PIX_FMT_BGR32_1 || dstFormat == AV_PIX_FMT_BGR24))) - c->swScale = palToRgbWrapper; + c->swscale = palToRgbWrapper; if (srcFormat == AV_PIX_FMT_YUV422P) { if (dstFormat == AV_PIX_FMT_YUYV422) - c->swScale = yuv422pToYuy2Wrapper; + c->swscale = yuv422pToYuy2Wrapper; else if (dstFormat == AV_PIX_FMT_UYVY422) - c->swScale = yuv422pToUyvyWrapper; + c->swscale = yuv422pToUyvyWrapper; } /* LQ converters if -sws 0 or -sws 4*/ @@ -1054,21 +1054,21 @@ void ff_get_unscaled_swscale(SwsContext *c) /* yv12_to_yuy2 */ if (srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUVA420P) { if (dstFormat == AV_PIX_FMT_YUYV422) - c->swScale = planarToYuy2Wrapper; + c->swscale = planarToYuy2Wrapper; else if (dstFormat == AV_PIX_FMT_UYVY422) - c->swScale = planarToUyvyWrapper; + c->swscale = planarToUyvyWrapper; } } if (srcFormat == AV_PIX_FMT_YUYV422 && (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P)) - c->swScale = yuyvToYuv420Wrapper; + c->swscale = yuyvToYuv420Wrapper; if (srcFormat == AV_PIX_FMT_UYVY422 && (dstFormat == AV_PIX_FMT_YUV420P || dstFormat == AV_PIX_FMT_YUVA420P)) - c->swScale = uyvyToYuv420Wrapper; + c->swscale = uyvyToYuv420Wrapper; if (srcFormat == AV_PIX_FMT_YUYV422 && dstFormat == AV_PIX_FMT_YUV422P) - c->swScale = yuyvToYuv422Wrapper; + c->swscale = yuyvToYuv422Wrapper; if (srcFormat == AV_PIX_FMT_UYVY422 && dstFormat == AV_PIX_FMT_YUV422P) - c->swScale = uyvyToYuv422Wrapper; + c->swscale = uyvyToYuv422Wrapper; /* simple copy */ if ( srcFormat == dstFormat || @@ -1084,9 +1084,9 @@ void ff_get_unscaled_swscale(SwsContext *c) srcFormat != AV_PIX_FMT_NV12 && srcFormat != AV_PIX_FMT_NV21)) { if (isPacked(c->srcFormat)) - c->swScale = packedCopyWrapper; + c->swscale = packedCopyWrapper; else /* Planar YUV or gray */ - c->swScale = planarCopyWrapper; + c->swscale = planarCopyWrapper; } if (ARCH_BFIN) @@ -1235,7 +1235,7 @@ int attribute_align_arg sws_scale(struct SwsContext *c, if (srcSliceY + srcSliceH == c->srcH) c->sliceDir = 0; - return c->swScale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2, + return c->swscale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2, dstStride2); } else { // slices go from bottom to top => we flip the image internally @@ -1261,7 +1261,7 @@ int attribute_align_arg sws_scale(struct SwsContext *c, if (!srcSliceY) c->sliceDir = 0; - return c->swScale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH, + return c->swscale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH, srcSliceH, dst2, dstStride2); } } diff --git a/libswscale/utils.c b/libswscale/utils.c index 740cdc0b9b..403c1381e8 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1010,7 +1010,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, (c->srcRange == c->dstRange || isAnyRGB(dstFormat))) { ff_get_unscaled_swscale(c); - if (c->swScale) { + if (c->swscale) { if (flags & SWS_PRINT_INFO) av_log(c, AV_LOG_INFO, "using unscaled %s -> %s special converter\n", @@ -1297,7 +1297,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, c->chrXInc, c->chrYInc); } - c->swScale = ff_getSwsFunc(c); + c->swscale = ff_getSwsFunc(c); return 0; fail: // FIXME replace things by appropriate error codes return -1; -- cgit v1.2.3