summaryrefslogtreecommitdiff
path: root/vp8/encoder/find_rotation.c
diff options
context:
space:
mode:
Diffstat (limited to 'vp8/encoder/find_rotation.c')
-rw-r--r--vp8/encoder/find_rotation.c67
1 files changed, 32 insertions, 35 deletions
diff --git a/vp8/encoder/find_rotation.c b/vp8/encoder/find_rotation.c
index 742c0ba81..59a0a722f 100644
--- a/vp8/encoder/find_rotation.c
+++ b/vp8/encoder/find_rotation.c
@@ -16,43 +16,40 @@
int vp8_find_best_rotation(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *bestmv,
int_mv *ref_mv, int *bri, int error_per_bit,
const vp8_variance_fn_ptr_t *vfp, int *mvcost[2],
- int *distortion, unsigned int *sse1)
-{
- unsigned char *z = (*(b->base_src) + b->src);
-
- int ri;
-
- int y_stride;
-
- unsigned int besterr;
- int br = bestmv->as_mv.row;
- int bc = bestmv->as_mv.col;
- unsigned char *y = *(d->base_pre) + d->pre + br * d->pre_stride + bc;
- y_stride = d->pre_stride;
-
- // calculate central point error
- besterr = vfp->vf(y, y_stride, z, b->src_stride, sse1);
- *distortion = besterr;
-
- // find the best matching rotation
- *bri = 5;
- for (ri = 0; ri < ROTATIONS; ri++)
- {
- unsigned int this_err;
- unsigned char pb[256];
- predict_rotated_16x16(ri, y, y_stride, pb, 16);
- this_err = vfp->vf(pb, 16, z, b->src_stride, sse1);
-
- if (this_err < besterr)
- {
- *bri = ri;
- besterr = this_err;
- }
+ int *distortion, unsigned int *sse1) {
+ unsigned char *z = (*(b->base_src) + b->src);
+
+ int ri;
+
+ int y_stride;
+
+ unsigned int besterr;
+ int br = bestmv->as_mv.row;
+ int bc = bestmv->as_mv.col;
+ unsigned char *y = *(d->base_pre) + d->pre + br * d->pre_stride + bc;
+ y_stride = d->pre_stride;
+
+ // calculate central point error
+ besterr = vfp->vf(y, y_stride, z, b->src_stride, sse1);
+ *distortion = besterr;
+
+ // find the best matching rotation
+ *bri = 5;
+ for (ri = 0; ri < ROTATIONS; ri++) {
+ unsigned int this_err;
+ unsigned char pb[256];
+ predict_rotated_16x16(ri, y, y_stride, pb, 16);
+ this_err = vfp->vf(pb, 16, z, b->src_stride, sse1);
+
+ if (this_err < besterr) {
+ *bri = ri;
+ besterr = this_err;
}
- *sse1 = besterr;
- *distortion = besterr;
+ }
+ *sse1 = besterr;
+ *distortion = besterr;
- return 0;
+ return 0;
}
#endif