[x265] [PATCH 8 of 9] more coding guideline
nvijay.anand at trispacetech.com
nvijay.anand at trispacetech.com
Mon Aug 22 12:39:58 CEST 2016
# HG changeset patch
# User N Vijay Anand <nvijay.anand at trispacetech.com>
# Date 1471860795 -19800
# Mon Aug 22 15:43:15 2016 +0530
# Node ID 3296b122391503f90aae6e3dab162e5a06b544bd
# Parent 54155ecf97fcc6dc0c4d91aaba9055ad0a0ea4f1
more coding guideline
diff -r 54155ecf97fc -r 3296b1223915 source/encoder/motion.cpp
--- a/source/encoder/motion.cpp Fri Aug 12 13:07:49 2016 +0530
+++ b/source/encoder/motion.cpp Mon Aug 22 15:43:15 2016 +0530
@@ -256,7 +256,7 @@
int cost = sad(fenc, FENC_STRIDE, fref + (mx) + (my) * stride, stride); \
cost += mvcost(MV(mx, my) << 2); \
COPY2_IF_LT(bcost, cost, bmv, MV(mx, my)); \
- PushToBMVStack(bmvStack, MV(mx,my), cost); \
+ PushToBMVStack(bmvStack, MV(mx, my), cost); \
} while (0)
#define COST_MV_X3_DIR(m0x, m0y, m1x, m1y, m2x, m2y, costs) \
@@ -270,9 +270,9 @@
(costs)[0] += mvcost((bmv + MV(m0x, m0y)) << 2); \
(costs)[1] += mvcost((bmv + MV(m1x, m1y)) << 2); \
(costs)[2] += mvcost((bmv + MV(m2x, m2y)) << 2); \
- PushToBMVStack(bmvStack, bmv+MV(m0x,m0y), (costs)[0]); \
- PushToBMVStack(bmvStack, bmv+MV(m1x,m1y), (costs)[1]); \
- PushToBMVStack(bmvStack, bmv+MV(m2x,m2y), (costs)[2]); \
+ PushToBMVStack(bmvStack, bmv + MV(m0x, m0y), (costs)[0]); \
+ PushToBMVStack(bmvStack, bmv + MV(m1x, m1y), (costs)[1]); \
+ PushToBMVStack(bmvStack, bmv + MV(m2x, m2y), (costs)[2]); \
}
#define COST_MV_PT_DIST_X4(m0x, m0y, p0, d0, m1x, m1y, p1, d1, m2x, m2y, p2, d2, m3x, m3y, p3, d3) \
@@ -288,13 +288,13 @@
(costs)[2] += mvcost(MV(m2x, m2y) << 2); \
(costs)[3] += mvcost(MV(m3x, m3y) << 2); \
COPY4_IF_LT(bcost, costs[0], bmv, MV(m0x, m0y), bPointNr, p0, bDistance, d0); \
- PushToBMVStack(bmvStack, MV(m0x,m0y), (costs)[0]); \
+ PushToBMVStack(bmvStack, MV(m0x, m0y), (costs)[0]); \
COPY4_IF_LT(bcost, costs[1], bmv, MV(m1x, m1y), bPointNr, p1, bDistance, d1); \
- PushToBMVStack(bmvStack, MV(m1x,m1y), (costs)[1]); \
+ PushToBMVStack(bmvStack, MV(m1x, m1y), (costs)[1]); \
COPY4_IF_LT(bcost, costs[2], bmv, MV(m2x, m2y), bPointNr, p2, bDistance, d2); \
- PushToBMVStack(bmvStack, MV(m2x,m2y), (costs)[2]); \
+ PushToBMVStack(bmvStack, MV(m2x, m2y), (costs)[2]); \
COPY4_IF_LT(bcost, costs[3], bmv, MV(m3x, m3y), bPointNr, p3, bDistance, d3); \
- PushToBMVStack(bmvStack, MV(m3x,m3y), (costs)[3]); \
+ PushToBMVStack(bmvStack, MV(m3x, m3y), (costs)[3]); \
}
#define COST_MV_X4(m0x, m0y, m1x, m1y, m2x, m2y, m3x, m3y) \
@@ -311,13 +311,13 @@
costs[2] += mvcost((omv + MV(m2x, m2y)) << 2); \
costs[3] += mvcost((omv + MV(m3x, m3y)) << 2); \
COPY2_IF_LT(bcost, costs[0], bmv, omv + MV(m0x, m0y)); \
- PushToBMVStack(bmvStack, omv+MV(m0x,m0y), costs[0]); \
+ PushToBMVStack(bmvStack, omv + MV(m0x, m0y), costs[0]); \
COPY2_IF_LT(bcost, costs[1], bmv, omv + MV(m1x, m1y)); \
- PushToBMVStack(bmvStack, omv+MV(m1x,m1y), costs[1]); \
+ PushToBMVStack(bmvStack, omv + MV(m1x, m1y), costs[1]); \
COPY2_IF_LT(bcost, costs[2], bmv, omv + MV(m2x, m2y)); \
- PushToBMVStack(bmvStack, omv+MV(m2x,m2y), costs[2]); \
+ PushToBMVStack(bmvStack, omv + MV(m2x, m2y), costs[2]); \
COPY2_IF_LT(bcost, costs[3], bmv, omv + MV(m3x, m3y)); \
- PushToBMVStack(bmvStack, omv+MV(m3x,m3y), costs[3]); \
+ PushToBMVStack(bmvStack, omv + MV(m3x, m3y), costs[3]); \
}
#define COST_MV_X4_DIR(m0x, m0y, m1x, m1y, m2x, m2y, m3x, m3y, costs) \
-------------- next part --------------
A non-text attachment was scrubbed...
Name: x265-8.patch
Type: text/x-patch
Size: 3620 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20160822/fd9470ec/attachment-0001.bin>
More information about the x265-devel
mailing list