aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-11-08 03:06:09 +0100
committerDiego Biurrun <diego@biurrun.de>2013-11-08 12:41:24 +0100
commitcb56c3961b18111796547db66e9ab0cec738a794 (patch)
tree0de923b581539bad2e04ee5127fa877586d7a43d /libavcodec
parent0338c396987c82b41d322630ea9712fe5f9561d6 (diff)
downloadffmpeg-cb56c3961b18111796547db66e9ab0cec738a794.tar.gz
h263dsp: K&R formatting cosmetics
Also remove array element numbering comments.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h263dsp.c110
1 files changed, 63 insertions, 47 deletions
diff --git a/libavcodec/h263dsp.c b/libavcodec/h263dsp.c
index e1da6b8e28..70ecdb9a89 100644
--- a/libavcodec/h263dsp.c
+++ b/libavcodec/h263dsp.c
@@ -23,78 +23,94 @@
#include "config.h"
#include "h263dsp.h"
-const uint8_t ff_h263_loop_filter_strength[32]={
-// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
- 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10,11,11,11,12,12,12
+const uint8_t ff_h263_loop_filter_strength[32] = {
+ 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7,
+ 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 11, 11, 12, 12, 12
};
-static void h263_h_loop_filter_c(uint8_t *src, int stride, int qscale){
+static void h263_h_loop_filter_c(uint8_t *src, int stride, int qscale)
+{
int y;
- const int strength= ff_h263_loop_filter_strength[qscale];
+ const int strength = ff_h263_loop_filter_strength[qscale];
- for(y=0; y<8; y++){
+ for (y = 0; y < 8; y++) {
int d1, d2, ad1;
- int p0= src[y*stride-2];
- int p1= src[y*stride-1];
- int p2= src[y*stride+0];
- int p3= src[y*stride+1];
- int d = (p0 - p3 + 4*(p2 - p1)) / 8;
-
- if (d<-2*strength) d1= 0;
- else if(d<- strength) d1=-2*strength - d;
- else if(d< strength) d1= d;
- else if(d< 2*strength) d1= 2*strength - d;
- else d1= 0;
+ int p0 = src[y * stride - 2];
+ int p1 = src[y * stride - 1];
+ int p2 = src[y * stride + 0];
+ int p3 = src[y * stride + 1];
+ int d = (p0 - p3 + 4 * (p2 - p1)) / 8;
+
+ if (d < -2 * strength)
+ d1 = 0;
+ else if (d < -strength)
+ d1 = -2 * strength - d;
+ else if (d < strength)
+ d1 = d;
+ else if (d < 2 * strength)
+ d1 = 2 * strength - d;
+ else
+ d1 = 0;
p1 += d1;
p2 -= d1;
- if(p1&256) p1= ~(p1>>31);
- if(p2&256) p2= ~(p2>>31);
+ if (p1 & 256)
+ p1 = ~(p1 >> 31);
+ if (p2 & 256)
+ p2 = ~(p2 >> 31);
- src[y*stride-1] = p1;
- src[y*stride+0] = p2;
+ src[y * stride - 1] = p1;
+ src[y * stride + 0] = p2;
- ad1= FFABS(d1)>>1;
+ ad1 = FFABS(d1) >> 1;
- d2= av_clip((p0-p3)/4, -ad1, ad1);
+ d2 = av_clip((p0 - p3) / 4, -ad1, ad1);
- src[y*stride-2] = p0 - d2;
- src[y*stride+1] = p3 + d2;
+ src[y * stride - 2] = p0 - d2;
+ src[y * stride + 1] = p3 + d2;
}
}
-static void h263_v_loop_filter_c(uint8_t *src, int stride, int qscale){
+static void h263_v_loop_filter_c(uint8_t *src, int stride, int qscale)
+{
int x;
- const int strength= ff_h263_loop_filter_strength[qscale];
+ const int strength = ff_h263_loop_filter_strength[qscale];
- for(x=0; x<8; x++){
+ for (x = 0; x < 8; x++) {
int d1, d2, ad1;
- int p0= src[x-2*stride];
- int p1= src[x-1*stride];
- int p2= src[x+0*stride];
- int p3= src[x+1*stride];
- int d = (p0 - p3 + 4*(p2 - p1)) / 8;
-
- if (d<-2*strength) d1= 0;
- else if(d<- strength) d1=-2*strength - d;
- else if(d< strength) d1= d;
- else if(d< 2*strength) d1= 2*strength - d;
- else d1= 0;
+ int p0 = src[x - 2 * stride];
+ int p1 = src[x - 1 * stride];
+ int p2 = src[x + 0 * stride];
+ int p3 = src[x + 1 * stride];
+ int d = (p0 - p3 + 4 * (p2 - p1)) / 8;
+
+ if (d < -2 * strength)
+ d1 = 0;
+ else if (d < -strength)
+ d1 = -2 * strength - d;
+ else if (d < strength)
+ d1 = d;
+ else if (d < 2 * strength)
+ d1 = 2 * strength - d;
+ else
+ d1 = 0;
p1 += d1;
p2 -= d1;
- if(p1&256) p1= ~(p1>>31);
- if(p2&256) p2= ~(p2>>31);
+ if (p1 & 256)
+ p1 = ~(p1 >> 31);
+ if (p2 & 256)
+ p2 = ~(p2 >> 31);
- src[x-1*stride] = p1;
- src[x+0*stride] = p2;
+ src[x - 1 * stride] = p1;
+ src[x + 0 * stride] = p2;
- ad1= FFABS(d1)>>1;
+ ad1 = FFABS(d1) >> 1;
- d2= av_clip((p0-p3)/4, -ad1, ad1);
+ d2 = av_clip((p0 - p3) / 4, -ad1, ad1);
- src[x-2*stride] = p0 - d2;
- src[x+ stride] = p3 + d2;
+ src[x - 2 * stride] = p0 - d2;
+ src[x + stride] = p3 + d2;
}
}