Browse code
avfilter/xbr: reindent after previous commit
Clément Bœsch authored on 2014/12/26 07:36:48Showing 1 changed files
| ... | ... |
@@ -92,29 +92,29 @@ static uint32_t pixel_diff(uint32_t x, uint32_t y, const uint32_t *r2y) |
| 92 | 92 |
const unsigned i = df(PH,PD) + df(PH,I5) + df(PF,I4) + df(PF,PB) + (df(PE,PI)<<2); \ |
| 93 | 93 |
if (e <= i) { \
|
| 94 | 94 |
const unsigned px = df(PE,PF) <= df(PE,PH) ? PF : PH; \ |
| 95 |
- if (e < i && (!eq(PF,PB) && !eq(PH,PD) || eq(PE,PI) \ |
|
| 96 |
- && (!eq(PF,I4) && !eq(PH,I5)) \ |
|
| 97 |
- || eq(PE,PG) || eq(PE,PC))) { \
|
|
| 98 |
- const unsigned ke = df(PF,PG); \ |
|
| 99 |
- const unsigned ki = df(PH,PC); \ |
|
| 100 |
- const int left = ke<<1 <= ki && PE != PG && PD != PG; \ |
|
| 101 |
- const int up = ke >= ki<<1 && PE != PC && PB != PC; \ |
|
| 102 |
- if (left && up) { \
|
|
| 103 |
- E[N3] = ALPHA_BLEND_224_W(E[N3], px); \ |
|
| 104 |
- E[N2] = ALPHA_BLEND_64_W( E[N2], px); \ |
|
| 105 |
- E[N1] = E[N2]; \ |
|
| 106 |
- } else if (left) { \
|
|
| 107 |
- E[N3] = ALPHA_BLEND_192_W(E[N3], px); \ |
|
| 108 |
- E[N2] = ALPHA_BLEND_64_W( E[N2], px); \ |
|
| 109 |
- } else if (up) { \
|
|
| 110 |
- E[N3] = ALPHA_BLEND_192_W(E[N3], px); \ |
|
| 111 |
- E[N1] = ALPHA_BLEND_64_W( E[N1], px); \ |
|
| 112 |
- } else { /* diagonal */ \
|
|
| 95 |
+ if (e < i && (!eq(PF,PB) && !eq(PH,PD) || eq(PE,PI) \ |
|
| 96 |
+ && (!eq(PF,I4) && !eq(PH,I5)) \ |
|
| 97 |
+ || eq(PE,PG) || eq(PE,PC))) { \
|
|
| 98 |
+ const unsigned ke = df(PF,PG); \ |
|
| 99 |
+ const unsigned ki = df(PH,PC); \ |
|
| 100 |
+ const int left = ke<<1 <= ki && PE != PG && PD != PG; \ |
|
| 101 |
+ const int up = ke >= ki<<1 && PE != PC && PB != PC; \ |
|
| 102 |
+ if (left && up) { \
|
|
| 103 |
+ E[N3] = ALPHA_BLEND_224_W(E[N3], px); \ |
|
| 104 |
+ E[N2] = ALPHA_BLEND_64_W( E[N2], px); \ |
|
| 105 |
+ E[N1] = E[N2]; \ |
|
| 106 |
+ } else if (left) { \
|
|
| 107 |
+ E[N3] = ALPHA_BLEND_192_W(E[N3], px); \ |
|
| 108 |
+ E[N2] = ALPHA_BLEND_64_W( E[N2], px); \ |
|
| 109 |
+ } else if (up) { \
|
|
| 110 |
+ E[N3] = ALPHA_BLEND_192_W(E[N3], px); \ |
|
| 111 |
+ E[N1] = ALPHA_BLEND_64_W( E[N1], px); \ |
|
| 112 |
+ } else { /* diagonal */ \
|
|
| 113 |
+ E[N3] = ALPHA_BLEND_128_W(E[N3], px); \ |
|
| 114 |
+ } \ |
|
| 115 |
+ } else { \
|
|
| 113 | 116 |
E[N3] = ALPHA_BLEND_128_W(E[N3], px); \ |
| 114 | 117 |
} \ |
| 115 |
- } else { \
|
|
| 116 |
- E[N3] = ALPHA_BLEND_128_W(E[N3], px); \ |
|
| 117 |
- } \ |
|
| 118 | 118 |
} \ |
| 119 | 119 |
} \ |
| 120 | 120 |
} while (0) |
| ... | ... |
@@ -126,37 +126,37 @@ static uint32_t pixel_diff(uint32_t x, uint32_t y, const uint32_t *r2y) |
| 126 | 126 |
const unsigned i = df(PH,PD) + df(PH,I5) + df(PF,I4) + df(PF,PB) + (df(PE,PI)<<2); \ |
| 127 | 127 |
if (e <= i) { \
|
| 128 | 128 |
const unsigned px = df(PE,PF) <= df(PE,PH) ? PF : PH; \ |
| 129 |
- if (e < i && (!eq(PF,PB) && !eq(PF,PC) || !eq(PH,PD) && !eq(PH,PG) || eq(PE,PI) \ |
|
| 130 |
- && (!eq(PF,F4) && !eq(PF,I4) || !eq(PH,H5) && !eq(PH,I5)) \ |
|
| 131 |
- || eq(PE,PG) || eq(PE,PC))) { \
|
|
| 132 |
- const unsigned ke = df(PF,PG); \ |
|
| 133 |
- const unsigned ki = df(PH,PC); \ |
|
| 134 |
- const int left = ke<<1 <= ki && PE != PG && PD != PG; \ |
|
| 135 |
- const int up = ke >= ki<<1 && PE != PC && PB != PC; \ |
|
| 136 |
- if (left && up) { \
|
|
| 137 |
- E[N7] = ALPHA_BLEND_192_W(E[N7], px); \ |
|
| 138 |
- E[N6] = ALPHA_BLEND_64_W( E[N6], px); \ |
|
| 139 |
- E[N5] = E[N7]; \ |
|
| 140 |
- E[N2] = E[N6]; \ |
|
| 141 |
- E[N8] = px; \ |
|
| 142 |
- } else if (left) { \
|
|
| 143 |
- E[N7] = ALPHA_BLEND_192_W(E[N7], px); \ |
|
| 144 |
- E[N5] = ALPHA_BLEND_64_W( E[N5], px); \ |
|
| 145 |
- E[N6] = ALPHA_BLEND_64_W( E[N6], px); \ |
|
| 146 |
- E[N8] = px; \ |
|
| 147 |
- } else if (up) { \
|
|
| 148 |
- E[N5] = ALPHA_BLEND_192_W(E[N5], px); \ |
|
| 149 |
- E[N7] = ALPHA_BLEND_64_W( E[N7], px); \ |
|
| 150 |
- E[N2] = ALPHA_BLEND_64_W( E[N2], px); \ |
|
| 151 |
- E[N8] = px; \ |
|
| 152 |
- } else { /* diagonal */ \
|
|
| 153 |
- E[N8] = ALPHA_BLEND_224_W(E[N8], px); \ |
|
| 154 |
- E[N5] = ALPHA_BLEND_32_W( E[N5], px); \ |
|
| 155 |
- E[N7] = ALPHA_BLEND_32_W( E[N7], px); \ |
|
| 129 |
+ if (e < i && (!eq(PF,PB) && !eq(PF,PC) || !eq(PH,PD) && !eq(PH,PG) || eq(PE,PI) \ |
|
| 130 |
+ && (!eq(PF,F4) && !eq(PF,I4) || !eq(PH,H5) && !eq(PH,I5)) \ |
|
| 131 |
+ || eq(PE,PG) || eq(PE,PC))) { \
|
|
| 132 |
+ const unsigned ke = df(PF,PG); \ |
|
| 133 |
+ const unsigned ki = df(PH,PC); \ |
|
| 134 |
+ const int left = ke<<1 <= ki && PE != PG && PD != PG; \ |
|
| 135 |
+ const int up = ke >= ki<<1 && PE != PC && PB != PC; \ |
|
| 136 |
+ if (left && up) { \
|
|
| 137 |
+ E[N7] = ALPHA_BLEND_192_W(E[N7], px); \ |
|
| 138 |
+ E[N6] = ALPHA_BLEND_64_W( E[N6], px); \ |
|
| 139 |
+ E[N5] = E[N7]; \ |
|
| 140 |
+ E[N2] = E[N6]; \ |
|
| 141 |
+ E[N8] = px; \ |
|
| 142 |
+ } else if (left) { \
|
|
| 143 |
+ E[N7] = ALPHA_BLEND_192_W(E[N7], px); \ |
|
| 144 |
+ E[N5] = ALPHA_BLEND_64_W( E[N5], px); \ |
|
| 145 |
+ E[N6] = ALPHA_BLEND_64_W( E[N6], px); \ |
|
| 146 |
+ E[N8] = px; \ |
|
| 147 |
+ } else if (up) { \
|
|
| 148 |
+ E[N5] = ALPHA_BLEND_192_W(E[N5], px); \ |
|
| 149 |
+ E[N7] = ALPHA_BLEND_64_W( E[N7], px); \ |
|
| 150 |
+ E[N2] = ALPHA_BLEND_64_W( E[N2], px); \ |
|
| 151 |
+ E[N8] = px; \ |
|
| 152 |
+ } else { /* diagonal */ \
|
|
| 153 |
+ E[N8] = ALPHA_BLEND_224_W(E[N8], px); \ |
|
| 154 |
+ E[N5] = ALPHA_BLEND_32_W( E[N5], px); \ |
|
| 155 |
+ E[N7] = ALPHA_BLEND_32_W( E[N7], px); \ |
|
| 156 |
+ } \ |
|
| 157 |
+ } else { \
|
|
| 158 |
+ E[N8] = ALPHA_BLEND_128_W(E[N8], px); \ |
|
| 156 | 159 |
} \ |
| 157 |
- } else { \
|
|
| 158 |
- E[N8] = ALPHA_BLEND_128_W(E[N8], px); \ |
|
| 159 |
- } \ |
|
| 160 | 160 |
} \ |
| 161 | 161 |
} \ |
| 162 | 162 |
} while (0) |
| ... | ... |
@@ -168,41 +168,41 @@ static uint32_t pixel_diff(uint32_t x, uint32_t y, const uint32_t *r2y) |
| 168 | 168 |
const unsigned i = df(PH,PD) + df(PH,I5) + df(PF,I4) + df(PF,PB) + (df(PE,PI)<<2); \ |
| 169 | 169 |
if (e <= i) { \
|
| 170 | 170 |
const unsigned px = df(PE,PF) <= df(PE,PH) ? PF : PH; \ |
| 171 |
- if (e < i && (!eq(PF,PB) && !eq(PH,PD) || eq(PE,PI) \ |
|
| 172 |
- && (!eq(PF,I4) && !eq(PH,I5)) \ |
|
| 173 |
- || eq(PE,PG) || eq(PE,PC))) { \
|
|
| 174 |
- const unsigned ke = df(PF,PG); \ |
|
| 175 |
- const unsigned ki = df(PH,PC); \ |
|
| 176 |
- const int left = ke<<1 <= ki && PE != PG && PD != PG; \ |
|
| 177 |
- const int up = ke >= ki<<1 && PE != PC && PB != PC; \ |
|
| 178 |
- if (left && up) { \
|
|
| 179 |
- E[N13] = ALPHA_BLEND_192_W(E[N13], px); \ |
|
| 180 |
- E[N12] = ALPHA_BLEND_64_W( E[N12], px); \ |
|
| 181 |
- E[N15] = E[N14] = E[N11] = px; \ |
|
| 182 |
- E[N10] = E[N3] = E[N12]; \ |
|
| 183 |
- E[N7] = E[N13]; \ |
|
| 184 |
- } else if (left) { \
|
|
| 185 |
- E[N11] = ALPHA_BLEND_192_W(E[N11], px); \ |
|
| 186 |
- E[N13] = ALPHA_BLEND_192_W(E[N13], px); \ |
|
| 187 |
- E[N10] = ALPHA_BLEND_64_W( E[N10], px); \ |
|
| 188 |
- E[N12] = ALPHA_BLEND_64_W( E[N12], px); \ |
|
| 189 |
- E[N14] = px; \ |
|
| 190 |
- E[N15] = px; \ |
|
| 191 |
- } else if (up) { \
|
|
| 192 |
- E[N14] = ALPHA_BLEND_192_W(E[N14], px); \ |
|
| 193 |
- E[N7 ] = ALPHA_BLEND_192_W(E[N7 ], px); \ |
|
| 194 |
- E[N10] = ALPHA_BLEND_64_W( E[N10], px); \ |
|
| 195 |
- E[N3 ] = ALPHA_BLEND_64_W( E[N3 ], px); \ |
|
| 196 |
- E[N11] = px; \ |
|
| 197 |
- E[N15] = px; \ |
|
| 198 |
- } else { /* diagonal */ \
|
|
| 199 |
- E[N11] = ALPHA_BLEND_128_W(E[N11], px); \ |
|
| 200 |
- E[N14] = ALPHA_BLEND_128_W(E[N14], px); \ |
|
| 201 |
- E[N15] = px; \ |
|
| 171 |
+ if (e < i && (!eq(PF,PB) && !eq(PH,PD) || eq(PE,PI) \ |
|
| 172 |
+ && (!eq(PF,I4) && !eq(PH,I5)) \ |
|
| 173 |
+ || eq(PE,PG) || eq(PE,PC))) { \
|
|
| 174 |
+ const unsigned ke = df(PF,PG); \ |
|
| 175 |
+ const unsigned ki = df(PH,PC); \ |
|
| 176 |
+ const int left = ke<<1 <= ki && PE != PG && PD != PG; \ |
|
| 177 |
+ const int up = ke >= ki<<1 && PE != PC && PB != PC; \ |
|
| 178 |
+ if (left && up) { \
|
|
| 179 |
+ E[N13] = ALPHA_BLEND_192_W(E[N13], px); \ |
|
| 180 |
+ E[N12] = ALPHA_BLEND_64_W( E[N12], px); \ |
|
| 181 |
+ E[N15] = E[N14] = E[N11] = px; \ |
|
| 182 |
+ E[N10] = E[N3] = E[N12]; \ |
|
| 183 |
+ E[N7] = E[N13]; \ |
|
| 184 |
+ } else if (left) { \
|
|
| 185 |
+ E[N11] = ALPHA_BLEND_192_W(E[N11], px); \ |
|
| 186 |
+ E[N13] = ALPHA_BLEND_192_W(E[N13], px); \ |
|
| 187 |
+ E[N10] = ALPHA_BLEND_64_W( E[N10], px); \ |
|
| 188 |
+ E[N12] = ALPHA_BLEND_64_W( E[N12], px); \ |
|
| 189 |
+ E[N14] = px; \ |
|
| 190 |
+ E[N15] = px; \ |
|
| 191 |
+ } else if (up) { \
|
|
| 192 |
+ E[N14] = ALPHA_BLEND_192_W(E[N14], px); \ |
|
| 193 |
+ E[N7 ] = ALPHA_BLEND_192_W(E[N7 ], px); \ |
|
| 194 |
+ E[N10] = ALPHA_BLEND_64_W( E[N10], px); \ |
|
| 195 |
+ E[N3 ] = ALPHA_BLEND_64_W( E[N3 ], px); \ |
|
| 196 |
+ E[N11] = px; \ |
|
| 197 |
+ E[N15] = px; \ |
|
| 198 |
+ } else { /* diagonal */ \
|
|
| 199 |
+ E[N11] = ALPHA_BLEND_128_W(E[N11], px); \ |
|
| 200 |
+ E[N14] = ALPHA_BLEND_128_W(E[N14], px); \ |
|
| 201 |
+ E[N15] = px; \ |
|
| 202 |
+ } \ |
|
| 203 |
+ } else { \
|
|
| 204 |
+ E[N15] = ALPHA_BLEND_128_W(E[N15], px); \ |
|
| 202 | 205 |
} \ |
| 203 |
- } else { \
|
|
| 204 |
- E[N15] = ALPHA_BLEND_128_W(E[N15], px); \ |
|
| 205 |
- } \ |
|
| 206 | 206 |
} \ |
| 207 | 207 |
} \ |
| 208 | 208 |
} while (0) |