[FFmpeg-cvslog] swscale: K&R formatting cosmetics for code examples
Diego Biurrun
git at videolan.org
Tue Jan 10 03:52:25 CET 2012
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Jan 3 12:20:59 2012 +0100| [999484c9fbc38f81df300ed356cf0f6ce26c949d] | committer: Diego Biurrun
swscale: K&R formatting cosmetics for code examples
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=999484c9fbc38f81df300ed356cf0f6ce26c949d
---
libswscale/colorspace-test.c | 79 ++++++++++--------
libswscale/swscale-test.c | 186 ++++++++++++++++++++---------------------
2 files changed, 136 insertions(+), 129 deletions(-)
diff --git a/libswscale/colorspace-test.c b/libswscale/colorspace-test.c
index ac3bb71..10cee8a 100644
--- a/libswscale/colorspace-test.c
+++ b/libswscale/colorspace-test.c
@@ -27,19 +27,19 @@
#include "swscale.h"
#include "rgb2rgb.h"
-#define SIZE 1000
+#define SIZE 1000
#define srcByte 0x55
#define dstByte 0xBB
-#define FUNC(s,d,n) {s,d,#n,n}
+#define FUNC(s, d, n) { s, d, #n, n }
int main(int argc, char **argv)
{
int i, funcNum;
uint8_t *srcBuffer = av_malloc(SIZE);
uint8_t *dstBuffer = av_malloc(SIZE);
- int failedNum=0;
- int passedNum=0;
+ int failedNum = 0;
+ int passedNum = 0;
if (!srcBuffer || !dstBuffer)
return -1;
@@ -47,7 +47,7 @@ int main(int argc, char **argv)
av_log(NULL, AV_LOG_INFO, "memory corruption test ...\n");
sws_rgb2rgb_init();
- for(funcNum=0; ; funcNum++) {
+ for (funcNum = 0; ; funcNum++) {
struct func_info_s {
int src_bpp;
int dst_bpp;
@@ -85,67 +85,78 @@ int main(int argc, char **argv)
FUNC(0, 0, NULL)
};
int width;
- int failed=0;
- int srcBpp=0;
- int dstBpp=0;
+ int failed = 0;
+ int srcBpp = 0;
+ int dstBpp = 0;
- if (!func_info[funcNum].func) break;
+ if (!func_info[funcNum].func)
+ break;
- av_log(NULL, AV_LOG_INFO,".");
+ av_log(NULL, AV_LOG_INFO, ".");
memset(srcBuffer, srcByte, SIZE);
- for(width=63; width>0; width--) {
+ for (width = 63; width > 0; width--) {
int dstOffset;
- for(dstOffset=128; dstOffset<196; dstOffset+=4) {
+ for (dstOffset = 128; dstOffset < 196; dstOffset += 4) {
int srcOffset;
memset(dstBuffer, dstByte, SIZE);
- for(srcOffset=128; srcOffset<196; srcOffset+=4) {
- uint8_t *src= srcBuffer+srcOffset;
- uint8_t *dst= dstBuffer+dstOffset;
- const char *name=NULL;
+ for (srcOffset = 128; srcOffset < 196; srcOffset += 4) {
+ uint8_t *src = srcBuffer + srcOffset;
+ uint8_t *dst = dstBuffer + dstOffset;
+ const char *name = NULL;
- if(failed) break; //don't fill the screen with shit ...
+ // don't fill the screen with shit ...
+ if (failed)
+ break;
srcBpp = func_info[funcNum].src_bpp;
dstBpp = func_info[funcNum].dst_bpp;
name = func_info[funcNum].name;
- func_info[funcNum].func(src, dst, width*srcBpp);
+ func_info[funcNum].func(src, dst, width * srcBpp);
- if(!srcBpp) break;
+ if (!srcBpp)
+ break;
- for(i=0; i<SIZE; i++) {
- if(srcBuffer[i]!=srcByte) {
- av_log(NULL, AV_LOG_INFO, "src damaged at %d w:%d src:%d dst:%d %s\n",
+ for (i = 0; i < SIZE; i++) {
+ if (srcBuffer[i] != srcByte) {
+ av_log(NULL, AV_LOG_INFO,
+ "src damaged at %d w:%d src:%d dst:%d %s\n",
i, width, srcOffset, dstOffset, name);
- failed=1;
+ failed = 1;
break;
}
}
- for(i=0; i<dstOffset; i++) {
- if(dstBuffer[i]!=dstByte) {
- av_log(NULL, AV_LOG_INFO, "dst damaged at %d w:%d src:%d dst:%d %s\n",
+ for (i = 0; i < dstOffset; i++) {
+ if (dstBuffer[i] != dstByte) {
+ av_log(NULL, AV_LOG_INFO,
+ "dst damaged at %d w:%d src:%d dst:%d %s\n",
i, width, srcOffset, dstOffset, name);
- failed=1;
+ failed = 1;
break;
}
}
- for(i=dstOffset + width*dstBpp; i<SIZE; i++) {
- if(dstBuffer[i]!=dstByte) {
- av_log(NULL, AV_LOG_INFO, "dst damaged at %d w:%d src:%d dst:%d %s\n",
+ for (i = dstOffset + width * dstBpp; i < SIZE; i++) {
+ if (dstBuffer[i] != dstByte) {
+ av_log(NULL, AV_LOG_INFO,
+ "dst damaged at %d w:%d src:%d dst:%d %s\n",
i, width, srcOffset, dstOffset, name);
- failed=1;
+ failed = 1;
break;
}
}
}
}
}
- if(failed) failedNum++;
- else if(srcBpp) passedNum++;
+ if (failed)
+ failedNum++;
+ else if (srcBpp)
+ passedNum++;
}
- av_log(NULL, AV_LOG_INFO, "\n%d converters passed, %d converters randomly overwrote memory\n", passedNum, failedNum);
+ av_log(NULL, AV_LOG_INFO,
+ "\n%d converters passed, %d converters randomly overwrote memory\n",
+ passedNum, failedNum);
return failedNum;
}
diff --git a/libswscale/swscale-test.c b/libswscale/swscale-test.c
index b5cf1d2..7ea01a6 100644
--- a/libswscale/swscale-test.c
+++ b/libswscale/swscale-test.c
@@ -35,33 +35,32 @@
/* HACK Duplicated from swscale_internal.h.
* Should be removed when a cleaner pixel format system exists. */
-#define isGray(x) ( \
- (x)==PIX_FMT_GRAY8 \
- || (x)==PIX_FMT_GRAY16BE \
- || (x)==PIX_FMT_GRAY16LE \
- )
-#define hasChroma(x) (!( \
- isGray(x) \
- || (x)==PIX_FMT_MONOBLACK \
- || (x)==PIX_FMT_MONOWHITE \
- ))
-#define isALPHA(x) ( \
- (x)==PIX_FMT_BGR32 \
- || (x)==PIX_FMT_BGR32_1 \
- || (x)==PIX_FMT_RGB32 \
- || (x)==PIX_FMT_RGB32_1 \
- || (x)==PIX_FMT_YUVA420P \
- )
-
-static uint64_t getSSD(uint8_t *src1, uint8_t *src2, int stride1, int stride2, int w, int h)
+#define isGray(x) \
+ ((x) == PIX_FMT_GRAY8 || \
+ (x) == PIX_FMT_Y400A || \
+ (x) == PIX_FMT_GRAY16BE || \
+ (x) == PIX_FMT_GRAY16LE)
+#define hasChroma(x) \
+ (!(isGray(x) || \
+ (x) == PIX_FMT_MONOBLACK || \
+ (x) == PIX_FMT_MONOWHITE))
+#define isALPHA(x) \
+ ((x) == PIX_FMT_BGR32 || \
+ (x) == PIX_FMT_BGR32_1 || \
+ (x) == PIX_FMT_RGB32 || \
+ (x) == PIX_FMT_RGB32_1 || \
+ (x) == PIX_FMT_YUVA420P)
+
+static uint64_t getSSD(uint8_t *src1, uint8_t *src2, int stride1,
+ int stride2, int w, int h)
{
- int x,y;
- uint64_t ssd=0;
+ int x, y;
+ uint64_t ssd = 0;
- for (y=0; y<h; y++) {
- for (x=0; x<w; x++) {
- int d= src1[x + y*stride1] - src2[x + y*stride2];
- ssd+= d*d;
+ for (y = 0; y < h; y++) {
+ for (x = 0; x < w; x++) {
+ int d = src1[x + y * stride1] - src2[x + y * stride2];
+ ssd += d * d;
}
}
return ssd;
@@ -86,14 +85,14 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h,
static int cur_srcW, cur_srcH;
static uint8_t *src[4];
static int srcStride[4];
- uint8_t *dst[4] = {0};
- uint8_t *out[4] = {0};
+ uint8_t *dst[4] = { 0 };
+ uint8_t *out[4] = { 0 };
int dstStride[4];
int i;
- uint64_t ssdY, ssdU=0, ssdV=0, ssdA=0;
+ uint64_t ssdY, ssdU = 0, ssdV = 0, ssdA = 0;
struct SwsContext *dstContext = NULL, *outContext = NULL;
uint32_t crc = 0;
- int res = 0;
+ int res = 0;
if (cur_srcFormat != srcFormat || cur_srcW != srcW || cur_srcH != srcH) {
struct SwsContext *srcContext = NULL;
@@ -105,11 +104,10 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h,
av_image_fill_linesizes(srcStride, srcFormat, srcW);
for (p = 0; p < 4; p++) {
if (srcStride[p])
- src[p] = av_mallocz(srcStride[p]*srcH+16);
+ src[p] = av_mallocz(srcStride[p] * srcH + 16);
if (srcStride[p] && !src[p]) {
perror("Malloc");
res = -1;
-
goto end;
}
}
@@ -120,19 +118,18 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h,
av_pix_fmt_descriptors[PIX_FMT_YUVA420P].name,
av_pix_fmt_descriptors[srcFormat].name);
res = -1;
-
goto end;
}
sws_scale(srcContext, ref, refStride, 0, h, src, srcStride);
sws_freeContext(srcContext);
cur_srcFormat = srcFormat;
- cur_srcW = srcW;
- cur_srcH = srcH;
+ cur_srcW = srcW;
+ cur_srcH = srcH;
}
av_image_fill_linesizes(dstStride, dstFormat, dstW);
- for (i=0; i<4; i++) {
+ for (i = 0; i < 4; i++) {
/* Image buffers passed into libswscale can be allocated any way you
* prefer, as long as they're aligned enough for the architecture, and
* they're freed appropriately (such as using av_free for buffers
@@ -140,7 +137,7 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h,
/* An extra 16 bytes is being allocated because some scalers may write
* out of bounds. */
if (dstStride[i])
- dst[i]= av_mallocz(dstStride[i]*dstH+16);
+ dst[i] = av_mallocz(dstStride[i] * dstH + 16);
if (dstStride[i] && !dst[i]) {
perror("Malloc");
res = -1;
@@ -149,13 +146,13 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h,
}
}
- dstContext= sws_getContext(srcW, srcH, srcFormat, dstW, dstH, dstFormat, flags, NULL, NULL, NULL);
+ dstContext = sws_getContext(srcW, srcH, srcFormat, dstW, dstH, dstFormat,
+ flags, NULL, NULL, NULL);
if (!dstContext) {
fprintf(stderr, "Failed to get %s ---> %s\n",
av_pix_fmt_descriptors[srcFormat].name,
av_pix_fmt_descriptors[dstFormat].name);
res = -1;
-
goto end;
}
@@ -167,9 +164,9 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h,
sws_scale(dstContext, src, srcStride, 0, srcH, dst, dstStride);
- for (i = 0; i < 4 && dstStride[i]; i++) {
- crc = av_crc(av_crc_get_table(AV_CRC_32_IEEE), crc, dst[i], dstStride[i] * dstH);
- }
+ for (i = 0; i < 4 && dstStride[i]; i++)
+ crc = av_crc(av_crc_get_table(AV_CRC_32_IEEE), crc, dst[i],
+ dstStride[i] * dstH);
if (r && crc == r->crc) {
ssdY = r->ssdY;
@@ -177,60 +174,59 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h,
ssdV = r->ssdV;
ssdA = r->ssdA;
} else {
- for (i=0; i<4; i++) {
+ for (i = 0; i < 4; i++) {
if (refStride[i])
- out[i]= av_mallocz(refStride[i]*h);
+ out[i] = av_mallocz(refStride[i] * h);
if (refStride[i] && !out[i]) {
perror("Malloc");
res = -1;
-
goto end;
}
}
- outContext= sws_getContext(dstW, dstH, dstFormat, w, h, PIX_FMT_YUVA420P, SWS_BILINEAR, NULL, NULL, NULL);
+ outContext = sws_getContext(dstW, dstH, dstFormat, w, h,
+ PIX_FMT_YUVA420P, SWS_BILINEAR,
+ NULL, NULL, NULL);
if (!outContext) {
fprintf(stderr, "Failed to get %s ---> %s\n",
av_pix_fmt_descriptors[dstFormat].name,
av_pix_fmt_descriptors[PIX_FMT_YUVA420P].name);
res = -1;
-
goto end;
}
sws_scale(outContext, dst, dstStride, 0, dstH, out, refStride);
- ssdY= getSSD(ref[0], out[0], refStride[0], refStride[0], w, h);
+ ssdY = getSSD(ref[0], out[0], refStride[0], refStride[0], w, h);
if (hasChroma(srcFormat) && hasChroma(dstFormat)) {
//FIXME check that output is really gray
- ssdU= getSSD(ref[1], out[1], refStride[1], refStride[1], (w+1)>>1, (h+1)>>1);
- ssdV= getSSD(ref[2], out[2], refStride[2], refStride[2], (w+1)>>1, (h+1)>>1);
+ ssdU = getSSD(ref[1], out[1], refStride[1], refStride[1],
+ (w + 1) >> 1, (h + 1) >> 1);
+ ssdV = getSSD(ref[2], out[2], refStride[2], refStride[2],
+ (w + 1) >> 1, (h + 1) >> 1);
}
if (isALPHA(srcFormat) && isALPHA(dstFormat))
- ssdA= getSSD(ref[3], out[3], refStride[3], refStride[3], w, h);
+ ssdA = getSSD(ref[3], out[3], refStride[3], refStride[3], w, h);
- ssdY/= w*h;
- ssdU/= w*h/4;
- ssdV/= w*h/4;
- ssdA/= w*h;
+ ssdY /= w * h;
+ ssdU /= w * h / 4;
+ ssdV /= w * h / 4;
+ ssdA /= w * h;
sws_freeContext(outContext);
- for (i=0; i<4; i++) {
+ for (i = 0; i < 4; i++)
if (refStride[i])
av_free(out[i]);
- }
}
- printf(" CRC=%08x SSD=%5"PRId64",%5"PRId64",%5"PRId64",%5"PRId64"\n",
+ printf(" CRC=%08x SSD=%5"PRId64 ",%5"PRId64 ",%5"PRId64 ",%5"PRId64 "\n",
crc, ssdY, ssdU, ssdV, ssdA);
end:
-
sws_freeContext(dstContext);
- for (i=0; i<4; i++) {
+ for (i = 0; i < 4; i++)
if (dstStride[i])
av_free(dst[i]);
- }
return res;
}
@@ -239,18 +235,18 @@ static void selfTest(uint8_t *ref[4], int refStride[4], int w, int h,
enum PixelFormat srcFormat_in,
enum PixelFormat dstFormat_in)
{
- const int flags[] = { SWS_FAST_BILINEAR,
- SWS_BILINEAR, SWS_BICUBIC,
- SWS_X , SWS_POINT , SWS_AREA, 0 };
- const int srcW = w;
- const int srcH = h;
- const int dstW[] = { srcW - srcW/3, srcW, srcW + srcW/3, 0 };
- const int dstH[] = { srcH - srcH/3, srcH, srcH + srcH/3, 0 };
+ const int flags[] = { SWS_FAST_BILINEAR, SWS_BILINEAR, SWS_BICUBIC,
+ SWS_X, SWS_POINT, SWS_AREA, 0 };
+ const int srcW = w;
+ const int srcH = h;
+ const int dstW[] = { srcW - srcW / 3, srcW, srcW + srcW / 3, 0 };
+ const int dstH[] = { srcH - srcH / 3, srcH, srcH + srcH / 3, 0 };
enum PixelFormat srcFormat, dstFormat;
for (srcFormat = srcFormat_in != PIX_FMT_NONE ? srcFormat_in : 0;
srcFormat < PIX_FMT_NB; srcFormat++) {
- if (!sws_isSupportedInput(srcFormat) || !sws_isSupportedOutput(srcFormat))
+ if (!sws_isSupportedInput(srcFormat) ||
+ !sws_isSupportedOutput(srcFormat))
continue;
for (dstFormat = dstFormat_in != PIX_FMT_NONE ? dstFormat_in : 0;
@@ -258,7 +254,8 @@ static void selfTest(uint8_t *ref[4], int refStride[4], int w, int h,
int i, j, k;
int res = 0;
- if (!sws_isSupportedInput(dstFormat) || !sws_isSupportedOutput(dstFormat))
+ if (!sws_isSupportedInput(dstFormat) ||
+ !sws_isSupportedOutput(dstFormat))
continue;
printf("%s -> %s\n",
@@ -266,14 +263,13 @@ static void selfTest(uint8_t *ref[4], int refStride[4], int w, int h,
av_pix_fmt_descriptors[dstFormat].name);
fflush(stdout);
- for (k = 0; flags[k] && !res; k++) {
+ for (k = 0; flags[k] && !res; k++)
for (i = 0; dstW[i] && !res; i++)
for (j = 0; dstH[j] && !res; j++)
res = doTest(ref, refStride, w, h,
srcFormat, dstFormat,
srcW, srcH, dstW[i], dstH[j], flags[k],
NULL);
- }
if (dstFormat_in != PIX_FMT_NONE)
break;
}
@@ -299,13 +295,14 @@ static int fileTest(uint8_t *ref[4], int refStride[4], int w, int h, FILE *fp,
int flags;
int ret;
- ret = sscanf(buf, " %12s %dx%d -> %12s %dx%d flags=%d CRC=%x"
- " SSD=%"PRId64", %"PRId64", %"PRId64", %"PRId64"\n",
- srcStr, &srcW, &srcH, dstStr, &dstW, &dstH,
- &flags, &r.crc, &r.ssdY, &r.ssdU, &r.ssdV, &r.ssdA);
+ ret = sscanf(buf,
+ " %12s %dx%d -> %12s %dx%d flags=%d CRC=%x"
+ " SSD=%"PRId64 ", %"PRId64 ", %"PRId64 ", %"PRId64 "\n",
+ srcStr, &srcW, &srcH, dstStr, &dstW, &dstH,
+ &flags, &r.crc, &r.ssdY, &r.ssdU, &r.ssdV, &r.ssdA);
if (ret != 12) {
srcStr[0] = dstStr[0] = 0;
- ret = sscanf(buf, "%12s -> %12s\n", srcStr, dstStr);
+ ret = sscanf(buf, "%12s -> %12s\n", srcStr, dstStr);
}
srcFormat = av_get_pix_fmt(srcStr);
@@ -339,12 +336,12 @@ int main(int argc, char **argv)
{
enum PixelFormat srcFormat = PIX_FMT_NONE;
enum PixelFormat dstFormat = PIX_FMT_NONE;
- uint8_t *rgb_data = av_malloc (W*H*4);
- uint8_t *rgb_src[3]= {rgb_data, NULL, NULL};
- int rgb_stride[3]={4*W, 0, 0};
- uint8_t *data = av_malloc (4*W*H);
- uint8_t *src[4]= {data, data+W*H, data+W*H*2, data+W*H*3};
- int stride[4]={W, W, W, W};
+ uint8_t *rgb_data = av_malloc(W * H * 4);
+ uint8_t *rgb_src[3] = { rgb_data, NULL, NULL };
+ int rgb_stride[3] = { 4 * W, 0, 0 };
+ uint8_t *data = av_malloc(4 * W * H);
+ uint8_t *src[4] = { data, data + W * H, data + W * H * 2, data + W * H * 3 };
+ int stride[4] = { W, W, W, W };
int x, y;
struct SwsContext *sws;
AVLFG rand;
@@ -354,41 +351,40 @@ int main(int argc, char **argv)
if (!rgb_data || !data)
return -1;
- sws= sws_getContext(W/12, H/12, PIX_FMT_RGB32, W, H, PIX_FMT_YUVA420P, SWS_BILINEAR, NULL, NULL, NULL);
+ sws = sws_getContext(W / 12, H / 12, PIX_FMT_RGB32, W, H,
+ PIX_FMT_YUVA420P, SWS_BILINEAR, NULL, NULL, NULL);
av_lfg_init(&rand, 1);
- for (y=0; y<H; y++) {
- for (x=0; x<W*4; x++) {
- rgb_data[ x + y*4*W]= av_lfg_get(&rand);
- }
- }
+ for (y = 0; y < H; y++)
+ for (x = 0; x < W * 4; x++)
+ rgb_data[ x + y * 4 * W] = av_lfg_get(&rand);
sws_scale(sws, rgb_src, rgb_stride, 0, H, src, stride);
sws_freeContext(sws);
av_free(rgb_data);
for (i = 1; i < argc; i += 2) {
- if (argv[i][0] != '-' || i+1 == argc)
+ if (argv[i][0] != '-' || i + 1 == argc)
goto bad_option;
if (!strcmp(argv[i], "-ref")) {
- FILE *fp = fopen(argv[i+1], "r");
+ FILE *fp = fopen(argv[i + 1], "r");
if (!fp) {
- fprintf(stderr, "could not open '%s'\n", argv[i+1]);
+ fprintf(stderr, "could not open '%s'\n", argv[i + 1]);
goto error;
}
res = fileTest(src, stride, W, H, fp, srcFormat, dstFormat);
fclose(fp);
goto end;
} else if (!strcmp(argv[i], "-src")) {
- srcFormat = av_get_pix_fmt(argv[i+1]);
+ srcFormat = av_get_pix_fmt(argv[i + 1]);
if (srcFormat == PIX_FMT_NONE) {
- fprintf(stderr, "invalid pixel format %s\n", argv[i+1]);
+ fprintf(stderr, "invalid pixel format %s\n", argv[i + 1]);
return -1;
}
} else if (!strcmp(argv[i], "-dst")) {
- dstFormat = av_get_pix_fmt(argv[i+1]);
+ dstFormat = av_get_pix_fmt(argv[i + 1]);
if (dstFormat == PIX_FMT_NONE) {
- fprintf(stderr, "invalid pixel format %s\n", argv[i+1]);
+ fprintf(stderr, "invalid pixel format %s\n", argv[i + 1]);
return -1;
}
} else {
More information about the ffmpeg-cvslog
mailing list