diff options
author | Mans Rullgard <mans@mansr.com> | 2012-07-01 15:39:22 +0100 |
---|---|---|
committer | Mans Rullgard <mans@mansr.com> | 2012-07-02 12:24:12 +0100 |
commit | 58e57c3052f3e0e921c5f2b27f9acb545c4d826e (patch) | |
tree | facb0884eccf33e5232a27851f80477a21353b52 /libavcodec/snow.c | |
parent | ff8f8dfb799e73987c46da7b33259b9df9b6823e (diff) | |
download | ffmpeg-streaming-58e57c3052f3e0e921c5f2b27f9acb545c4d826e.zip ffmpeg-streaming-58e57c3052f3e0e921c5f2b27f9acb545c4d826e.tar.gz |
snow: remove VLA in mc_block()
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/snow.c')
-rw-r--r-- | libavcodec/snow.c | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c index edd7d07..821b81b 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -143,7 +143,7 @@ static void mc_block(Plane *p, uint8_t *dst, const uint8_t *src, int stride, int int x, y, b, r, l; int16_t tmpIt [64*(32+HTAPS_MAX)]; - uint8_t tmp2t[3][stride*(32+HTAPS_MAX)]; + uint8_t tmp2t[3][64*(32+HTAPS_MAX)]; int16_t *tmpI= tmpIt; uint8_t *tmp2= tmp2t[0]; const uint8_t *hpel[11]; @@ -181,7 +181,7 @@ static void mc_block(Plane *p, uint8_t *dst, const uint8_t *src, int stride, int tmp2[x]= am; } tmpI+= 64; - tmp2+= stride; + tmp2+= 64; src += stride; } src -= stride*y; @@ -210,7 +210,7 @@ static void mc_block(Plane *p, uint8_t *dst, const uint8_t *src, int stride, int tmp2[x]= am; } src += stride; - tmp2+= stride; + tmp2+= 64; } src -= stride*y; } @@ -237,12 +237,12 @@ static void mc_block(Plane *p, uint8_t *dst, const uint8_t *src, int stride, int tmp2[x]= am; } tmpI+= 64; - tmp2+= stride; + tmp2+= 64; } } hpel[ 0]= src; - hpel[ 1]= tmp2t[0] + stride*(HTAPS_MAX/2-1); + hpel[ 1]= tmp2t[0] + 64*(HTAPS_MAX/2-1); hpel[ 2]= src + 1; hpel[ 4]= tmp2t[1]; @@ -250,14 +250,21 @@ static void mc_block(Plane *p, uint8_t *dst, const uint8_t *src, int stride, int hpel[ 6]= tmp2t[1] + 1; hpel[ 8]= src + stride; - hpel[ 9]= hpel[1] + stride; + hpel[ 9]= hpel[1] + 64; hpel[10]= hpel[8] + 1; +#define MC_STRIDE(x) (needs[x] ? 64 : stride) + if(b==15){ - const uint8_t *src1= hpel[dx/8 + dy/8*4 ]; - const uint8_t *src2= hpel[dx/8 + dy/8*4+1]; - const uint8_t *src3= hpel[dx/8 + dy/8*4+4]; - const uint8_t *src4= hpel[dx/8 + dy/8*4+5]; + int dxy = dx / 8 + dy / 8 * 4; + const uint8_t *src1 = hpel[dxy ]; + const uint8_t *src2 = hpel[dxy + 1]; + const uint8_t *src3 = hpel[dxy + 4]; + const uint8_t *src4 = hpel[dxy + 5]; + int stride1 = MC_STRIDE(dxy); + int stride2 = MC_STRIDE(dxy + 1); + int stride3 = MC_STRIDE(dxy + 4); + int stride4 = MC_STRIDE(dxy + 5); dx&=7; dy&=7; for(y=0; y < b_h; y++){ @@ -265,23 +272,25 @@ static void mc_block(Plane *p, uint8_t *dst, const uint8_t *src, int stride, int dst[x]= ((8-dx)*(8-dy)*src1[x] + dx*(8-dy)*src2[x]+ (8-dx)* dy *src3[x] + dx* dy *src4[x]+32)>>6; } - src1+=stride; - src2+=stride; - src3+=stride; - src4+=stride; + src1+=stride1; + src2+=stride2; + src3+=stride3; + src4+=stride4; dst +=stride; } }else{ const uint8_t *src1= hpel[l]; const uint8_t *src2= hpel[r]; + int stride1 = MC_STRIDE(l); + int stride2 = MC_STRIDE(r); int a= weight[((dx&7) + (8*(dy&7)))]; int b= 8-a; for(y=0; y < b_h; y++){ for(x=0; x < b_w; x++){ dst[x]= (a*src1[x] + b*src2[x] + 4)>>3; } - src1+=stride; - src2+=stride; + src1+=stride1; + src2+=stride2; dst +=stride; } } |