[FFmpeg-soc] [soc]: r3913 - in dirac/libavcodec: dwt.c dwt.h
conrad
subversion at mplayerhq.hu
Thu Jan 1 21:31:35 CET 2009
Author: conrad
Date: Thu Jan 1 21:31:35 2009
New Revision: 3913
Log:
Deslauriers-Dubuc 13/7 idwt
Modified:
dirac/libavcodec/dwt.c
dirac/libavcodec/dwt.h
Modified: dirac/libavcodec/dwt.c
==============================================================================
--- dirac/libavcodec/dwt.c Thu Jan 1 21:31:33 2009 (r3912)
+++ dirac/libavcodec/dwt.c Thu Jan 1 21:31:35 2009 (r3913)
@@ -35,6 +35,12 @@ static inline int extend(int v, int m){
else return v;
}
+static inline int extend_odd(int v, int m){
+ if (v<1) return 1;
+ else if(v>m) return m;
+ else return v;
+}
+
#define COMPOSE_53iL0(b0, b1, b2)\
(b1 - ((b0 + b2 + 2) >> 2))
@@ -44,6 +50,9 @@ static inline int extend(int v, int m){
#define COMPOSE_DD97iH0(b0, b1, b2, b3, b4)\
(b2 + ((-b0 + 9*b1 + 9*b3 - b4 + 8) >> 4))
+#define COMPOSE_DD137iL0(b0, b1, b2, b3, b4)\
+ (b2 - ((-b0 + 9*b1 + 9*b3 - b4 + 16) >> 5))
+
static av_always_inline
void interleave(IDWTELEM *dst, IDWTELEM *src0, IDWTELEM *src1, int width,
int add, int shift){
@@ -161,6 +170,66 @@ static void spatial_compose_dd97i_dy(dwt
cs->y += 2;
}
+static void horizontal_compose_dd137i(IDWTELEM *b, int w){
+ IDWTELEM temp[w];
+ const int w2 = w >> 1;
+ int x;
+
+ temp[0] = COMPOSE_DD137iL0(b[w2], b[w2], b[0], b[w2 ], b[w2+1]);
+ temp[1] = COMPOSE_DD137iL0(b[w2], b[w2], b[1], b[w2+1], b[w2+2]);
+ for (x = 0; x < w2-3; x++)
+ temp[x+2] = COMPOSE_DD137iL0(b[x+w2], b[x+w2+1], b[x+2], b[x+w2+2], b[x+w2+3]);
+ temp[w2-1] = COMPOSE_DD137iL0(b[w-3], b[w-2], b[w2-1], b[w-1], b[w-1]);
+
+ temp[w2] = COMPOSE_DD97iH0(temp[0], temp[0], b[w2], temp[1], temp[2]);
+ for (x = 0; x < w2-2; x++)
+ temp[x+w2+1] = COMPOSE_DD97iH0(temp[x], temp[x+1], b[x+w2+1], temp[x+2], temp[x+3]);
+ temp[w-2] = COMPOSE_DD97iH0(temp[w2-3], temp[w2-2], b[w-2], temp[w2-1], temp[w2-1]);
+ temp[w-1] = COMPOSE_DD97iH0(temp[w2-2], temp[w2-1], b[w-1], temp[w2-1], temp[w2-1]);
+
+ interleave(b, temp, temp+w2, w, 1, 1);
+}
+
+static void vertical_compose_dd137iL0(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2,
+ IDWTELEM *b3, IDWTELEM *b4, int width){
+ int i;
+
+ for(i=0; i<width; i++){
+ b2[i] = COMPOSE_DD137iL0(b0[i], b1[i], b2[i], b3[i], b4[i]);
+ }
+}
+
+static void spatial_compose_dd137i_dy(dwt_compose *cs, IDWTELEM *buffer,
+ int width, int height, int stride){
+ int y = cs->y;
+ IDWTELEM *b0= cs->b0;
+ IDWTELEM *b1= cs->b1;
+ IDWTELEM *b2= cs->b2;
+ IDWTELEM *b3= cs->b3;
+ IDWTELEM *b4= cs->b4;
+ IDWTELEM *b5= cs->b5;
+ IDWTELEM *b6= cs->b6;
+ IDWTELEM *b7= cs->b7;
+ IDWTELEM *b8= buffer + extend (y+7, height-2)*stride;
+ IDWTELEM *b9= buffer + extend_odd(y+8, height-1)*stride;
+
+ if(y+5<(unsigned)height) vertical_compose_dd137iL0(b3, b5, b6, b7, b9, width);
+ if(y+1<(unsigned)height) vertical_compose_dd97iH0 (b0, b2, b3, b4, b6, width);
+
+ if(y-1<(unsigned)height) horizontal_compose_dd137i(b0, width);
+ if(y+0<(unsigned)height) horizontal_compose_dd137i(b1, width);
+
+ cs->b0=b2;
+ cs->b1=b3;
+ cs->b2=b4;
+ cs->b3=b5;
+ cs->b4=b6;
+ cs->b5=b7;
+ cs->b6=b8;
+ cs->b7=b9;
+ cs->y += 2;
+}
+
static void spatial_compose53i_init(dwt_compose *cs, IDWTELEM *buffer,
int height, int stride){
cs->b0 = buffer + mirror(-1-1, height-1)*stride;
@@ -179,6 +248,19 @@ static void spatial_compose_dd97i_init(d
cs->y = -5;
}
+static void spatial_compose_dd137i_init(dwt_compose *cs, IDWTELEM *buffer,
+ int height, int stride){
+ cs->b0 = buffer + extend (-5-1, height-2)*stride;
+ cs->b1 = buffer + extend_odd(-5 , height-1)*stride;
+ cs->b2 = buffer + extend (-5+1, height-2)*stride;
+ cs->b3 = buffer + extend_odd(-5+2, height-1)*stride;
+ cs->b4 = buffer + extend (-5+3, height-2)*stride;
+ cs->b5 = buffer + extend_odd(-5+4, height-1)*stride;
+ cs->b6 = buffer + extend (-5+5, height-2)*stride;
+ cs->b7 = buffer + extend_odd(-5+6, height-1)*stride;
+ cs->y = -5;
+}
+
void ff_spatial_idwt_init2(dwt_compose *cs, IDWTELEM *buffer, int width, int height,
int stride, int type, int decomposition_count){
int level;
@@ -193,13 +275,16 @@ void ff_spatial_idwt_init2(dwt_compose *
case DWT_DIRAC_LEGALL5_3:
spatial_compose53i_init(cs+level, buffer, hl, stride_l);
break;
+ case DWT_DIRAC_DD13_7:
+ spatial_compose_dd137i_init(cs+level, buffer, hl, stride_l);
+ break;
}
}
}
void ff_spatial_idwt_slice2(dwt_compose *cs, IDWTELEM *buffer, int width, int height,
int stride, int type, int decomposition_count, int y){
- const int support[] = {5, 3, 7, 3};
+ const int support[] = {5, 3, 7, 3, 7};
int level;
for(level=decomposition_count-1; level>=0; level--){
@@ -215,6 +300,9 @@ void ff_spatial_idwt_slice2(dwt_compose
case DWT_DIRAC_LEGALL5_3:
spatial_compose_dirac53i_dy(cs+level, buffer, wl, hl, stride_l);
break;
+ case DWT_DIRAC_DD13_7:
+ spatial_compose_dd137i_dy(cs+level, buffer, wl, hl, stride_l);
+ break;
}
}
}
Modified: dirac/libavcodec/dwt.h
==============================================================================
--- dirac/libavcodec/dwt.h Thu Jan 1 21:31:33 2009 (r3912)
+++ dirac/libavcodec/dwt.h Thu Jan 1 21:31:35 2009 (r3913)
@@ -32,6 +32,8 @@ typedef struct {
IDWTELEM *b3;
IDWTELEM *b4;
IDWTELEM *b5;
+ IDWTELEM *b6;
+ IDWTELEM *b7;
} dwt_compose;
#define DWT_SNOW_DAUB9_7 0
More information about the FFmpeg-soc
mailing list