Mercurial > mplayer.hg
changeset 28531:a14b65e14dc9
Implement sws_printVec2() and deprecate sws_printVec().
author | stefano |
---|---|
date | Sat, 14 Feb 2009 20:14:28 +0000 |
parents | c86a4810a0f3 |
children | e5a0c2f38f96 |
files | libswscale/swscale.c libswscale/swscale.h |
diffstat | 2 files changed, 25 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libswscale/swscale.c Sat Feb 14 19:37:13 2009 +0000 +++ b/libswscale/swscale.c Sat Feb 14 20:14:28 2009 +0000 @@ -3068,7 +3068,7 @@ return vec; } -void sws_printVec(SwsVector *a){ +void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level){ int i; double max=0; double min=0; @@ -3085,12 +3085,18 @@ for (i=0; i<a->length; i++) { int x= (int)((a->coeff[i]-min)*60.0/range +0.5); - av_log(NULL, AV_LOG_DEBUG, "%1.3f ", a->coeff[i]); - for (;x>0; x--) av_log(NULL, AV_LOG_DEBUG, " "); - av_log(NULL, AV_LOG_DEBUG, "|\n"); + av_log(log_ctx, log_level, "%1.3f ", a->coeff[i]); + for (;x>0; x--) av_log(log_ctx, log_level, " "); + av_log(log_ctx, log_level, "|\n"); } } +#if LIBSWSCALE_VERSION_MAJOR < 1 +void sws_printVec(SwsVector *a){ + sws_printVec2(a, NULL, AV_LOG_DEBUG); +} +#endif + void sws_freeVec(SwsVector *a){ if (!a) return; av_freep(&a->coeff);
--- a/libswscale/swscale.h Sat Feb 14 19:37:13 2009 +0000 +++ b/libswscale/swscale.h Sat Feb 14 20:14:28 2009 +0000 @@ -30,8 +30,8 @@ #include "libavutil/avutil.h" #define LIBSWSCALE_VERSION_MAJOR 0 -#define LIBSWSCALE_VERSION_MINOR 6 -#define LIBSWSCALE_VERSION_MICRO 2 +#define LIBSWSCALE_VERSION_MINOR 7 +#define LIBSWSCALE_VERSION_MICRO 0 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \ @@ -182,7 +182,19 @@ */ SwsVector *sws_cloneVec(SwsVector *a); -void sws_printVec(SwsVector *a); +#if LIBSWSCALE_VERSION_MAJOR < 1 +/** + * @deprecated Use sws_printVec2() instead. + */ +attribute_deprecated void sws_printVec(SwsVector *a); +#endif + +/** + * Prints with av_log() a textual representation of the vector \p a + * if \p log_level <= av_log_level. + */ +void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level); + void sws_freeVec(SwsVector *a); SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,