generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vpxenc: cosmetics

Browse Source 
find_mismatch() / compare_img(): const, whitespace

Change-Id: I1c65c2aac378535001720aca31e7437ee5492739
This commit is contained in:
James Zern 2014-01-31 15:49:17 -08:00
parent 903801f1ef
commit d04112d27f
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
vpxenc.c
View File

@ -474,7 +474,8 @@ void usage_exit() {
}
#define mmin(a, b) ((a) < (b) ? (a) : (b))
static void find_mismatch(vpx_image_t *img1, vpx_image_t *img2,
static void find_mismatch(const vpx_image_t *const img1,
const vpx_image_t *const img2,
int yloc[4], int uloc[4], int vloc[4]) {
const unsigned int bsize = 64;
const unsigned int bsizey = bsize >> img1->y_chroma_shift;
@ -487,10 +488,10 @@ static void find_mismatch(vpx_image_t *img1, vpx_image_t *img2,
for (i = 0, match = 1; match && i < img1->d_h; i += bsize) {
for (j = 0; match && j < img1->d_w; j += bsize) {
int k, l;
int si = mmin(i + bsize, img1->d_h) - i;
int sj = mmin(j + bsize, img1->d_w) - j;
for (k = 0; match && k < si; k++)
for (l = 0; match && l < sj; l++) {
const int si = mmin(i + bsize, img1->d_h) - i;
const int sj = mmin(j + bsize, img1->d_w) - j;
for (k = 0; match && k < si; ++k) {
for (l = 0; match && l < sj; ++l) {
if (*(img1->planes[VPX_PLANE_Y] +
(i + k) * img1->stride[VPX_PLANE_Y] + j + l) !=
*(img2->planes[VPX_PLANE_Y] +
@ -505,6 +506,7 @@ static void find_mismatch(vpx_image_t *img1, vpx_image_t *img2,
break;
}
}
}
}
}
@ -512,10 +514,10 @@ static void find_mismatch(vpx_image_t *img1, vpx_image_t *img2,
for (i = 0, match = 1; match && i < c_h; i += bsizey) {
for (j = 0; match && j < c_w; j += bsizex) {
int k, l;
int si = mmin(i + bsizey, c_h - i);
int sj = mmin(j + bsizex, c_w - j);
for (k = 0; match && k < si; k++)
for (l = 0; match && l < sj; l++) {
const int si = mmin(i + bsizey, c_h - i);
const int sj = mmin(j + bsizex, c_w - j);
for (k = 0; match && k < si; ++k) {
for (l = 0; match && l < sj; ++l) {
if (*(img1->planes[VPX_PLANE_U] +
(i + k) * img1->stride[VPX_PLANE_U] + j + l) !=
*(img2->planes[VPX_PLANE_U] +
@ -525,21 +527,22 @@ static void find_mismatch(vpx_image_t *img1, vpx_image_t *img2,
uloc[2] = *(img1->planes[VPX_PLANE_U] +
(i + k) * img1->stride[VPX_PLANE_U] + j + l);
uloc[3] = *(img2->planes[VPX_PLANE_U] +
(i + k) * img2->stride[VPX_PLANE_V] + j + l);
(i + k) * img2->stride[VPX_PLANE_U] + j + l);
match = 0;
break;
}
}
}
}
}
vloc[0] = vloc[1] = vloc[2] = vloc[3] = -1;
for (i = 0, match = 1; match && i < c_h; i += bsizey) {
for (j = 0; match && j < c_w; j += bsizex) {
int k, l;
int si = mmin(i + bsizey, c_h - i);
int sj = mmin(j + bsizex, c_w - j);
for (k = 0; match && k < si; k++)
for (l = 0; match && l < sj; l++) {
const int si = mmin(i + bsizey, c_h - i);
const int sj = mmin(j + bsizex, c_w - j);
for (k = 0; match && k < si; ++k) {
for (l = 0; match && l < sj; ++l) {
if (*(img1->planes[VPX_PLANE_V] +
(i + k) * img1->stride[VPX_PLANE_V] + j + l) !=
*(img2->planes[VPX_PLANE_V] +
@ -554,12 +557,13 @@ static void find_mismatch(vpx_image_t *img1, vpx_image_t *img2,
break;
}
}
}
}
}
}
static int compare_img(vpx_image_t *img1, vpx_image_t *img2)
{
static int compare_img(const vpx_image_t *const img1,
const vpx_image_t *const img2) {
const int c_w = (img1->d_w + img1->x_chroma_shift) >> img1->x_chroma_shift;
const int c_h = (img1->d_h + img1->y_chroma_shift) >> img1->y_chroma_shift;
int match = 1;
@ -569,19 +573,19 @@ static int compare_img(vpx_image_t *img1, vpx_image_t *img2)
match &= (img1->d_w == img2->d_w);
match &= (img1->d_h == img2->d_h);
for (i = 0; i < img1->d_h; i++)
match &= (memcmp(img1->planes[VPX_PLANE_Y]+i*img1->stride[VPX_PLANE_Y],
img2->planes[VPX_PLANE_Y]+i*img2->stride[VPX_PLANE_Y],
for (i = 0; i < img1->d_h; ++i)
match &= (memcmp(img1->planes[VPX_PLANE_Y] + i * img1->stride[VPX_PLANE_Y],
img2->planes[VPX_PLANE_Y] + i * img2->stride[VPX_PLANE_Y],
img1->d_w) == 0);
for (i = 0; i < c_h; i++)
match &= (memcmp(img1->planes[VPX_PLANE_U]+i*img1->stride[VPX_PLANE_U],
img2->planes[VPX_PLANE_U]+i*img2->stride[VPX_PLANE_U],
for (i = 0; i < c_h; ++i)
match &= (memcmp(img1->planes[VPX_PLANE_U] + i * img1->stride[VPX_PLANE_U],
img2->planes[VPX_PLANE_U] + i * img2->stride[VPX_PLANE_U],
c_w) == 0);
for (i = 0; i < c_h; i++)
match &= (memcmp(img1->planes[VPX_PLANE_V]+i*img1->stride[VPX_PLANE_U],
img2->planes[VPX_PLANE_V]+i*img2->stride[VPX_PLANE_U],
for (i = 0; i < c_h; ++i)
match &= (memcmp(img1->planes[VPX_PLANE_V] + i * img1->stride[VPX_PLANE_V],
img2->planes[VPX_PLANE_V] + i * img2->stride[VPX_PLANE_V],
c_w) == 0);
return match;