From 4fd06a78aecf6b52ae28170cfa05ba0d36e75265 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 18 Jul 2013 13:45:48 +0200 Subject: sws_utils: remove some old code --- video/sws_utils.c | 70 ------------------------------------------------------- video/sws_utils.h | 6 ----- 2 files changed, 76 deletions(-) (limited to 'video') diff --git a/video/sws_utils.c b/video/sws_utils.c index a49f56397a..6d88a537e4 100644 --- a/video/sws_utils.c +++ b/video/sws_utils.c @@ -38,76 +38,6 @@ int sws_chr_hshift = 0; float sws_chr_sharpen = 0.0; float sws_lum_sharpen = 0.0; -//global srcFilter -static SwsFilter *src_filter = NULL; - -void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, - SwsFilter **dstFilterParam) -{ - static int firstTime = 1; - *flags = 0; - - if (firstTime) { - firstTime = 0; - *flags = SWS_PRINT_INFO; - } else if (mp_msg_test(MSGT_VFILTER, MSGL_DBG2)) - *flags = SWS_PRINT_INFO; - - if (src_filter) - sws_freeFilter(src_filter); - - src_filter = sws_getDefaultFilter( - sws_lum_gblur, sws_chr_gblur, - sws_lum_sharpen, sws_chr_sharpen, - sws_chr_hshift, sws_chr_vshift, verbose > 1); - - switch (sws_flags) { - case 0: *flags |= SWS_FAST_BILINEAR; - break; - case 1: *flags |= SWS_BILINEAR; - break; - case 2: *flags |= SWS_BICUBIC; - break; - case 3: *flags |= SWS_X; - break; - case 4: *flags |= SWS_POINT; - break; - case 5: *flags |= SWS_AREA; - break; - case 6: *flags |= SWS_BICUBLIN; - break; - case 7: *flags |= SWS_GAUSS; - break; - case 8: *flags |= SWS_SINC; - break; - case 9: *flags |= SWS_LANCZOS; - break; - case 10: *flags |= SWS_SPLINE; - break; - default: *flags |= SWS_BILINEAR; - break; - } - - *srcFilterParam = src_filter; - *dstFilterParam = NULL; -} - -// will use sws_flags & src_filter (from cmd line) -struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, - int srcFormat, int dstW, - int dstH, int dstFormat) -{ - int flags; - SwsFilter *dstFilterParam, *srcFilterParam; - enum PixelFormat dfmt, sfmt; - - dfmt = imgfmt2pixfmt(dstFormat); - sfmt = imgfmt2pixfmt(srcFormat); - sws_getFlagsAndFilterFromCmdLine(&flags, &srcFilterParam, &dstFilterParam); - - return sws_getContext(srcW, srcH, sfmt, dstW, dstH, dfmt, flags, - srcFilterParam, dstFilterParam, NULL); -} // Set ctx parameters to global command line flags. void mp_sws_set_from_cmdline(struct mp_sws_context *ctx) diff --git a/video/sws_utils.h b/video/sws_utils.h index bef8e465ce..aa6828a35e 100644 --- a/video/sws_utils.h +++ b/video/sws_utils.h @@ -14,12 +14,6 @@ struct mp_csp_details; // Guaranteed to be a power of 2 and > 1. #define SWS_MIN_BYTE_ALIGN 16 -void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, - SwsFilter **dstFilterParam); -struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, - int dstW, int dstH, - int dstFormat); - bool mp_sws_supported_format(int imgfmt); void mp_image_swscale(struct mp_image *dst, struct mp_image *src, -- cgit v1.2.3