Mercurial > libavcodec.hg
comparison adx.c @ 5525:bc4791868c52 libavcodec
various simplifications around recent av_clip_int16() usage
author | aurel |
---|---|
date | Sat, 11 Aug 2007 23:17:03 +0000 |
parents | c2ab2ac31edb |
children | cf77b8588f15 |
comparison
equal
deleted
inserted
replaced
5524:f47bc5359101 | 5525:bc4791868c52 |
---|---|
106 for(i=0;i<16;i++) { | 106 for(i=0;i<16;i++) { |
107 d = in[i]; | 107 d = in[i]; |
108 // d>>=4; if (d&8) d-=16; | 108 // d>>=4; if (d&8) d-=16; |
109 d = ((signed char)d >> 4); | 109 d = ((signed char)d >> 4); |
110 s0 = (BASEVOL*d*scale + SCALE1*s1 - SCALE2*s2)>>14; | 110 s0 = (BASEVOL*d*scale + SCALE1*s1 - SCALE2*s2)>>14; |
111 s0 = av_clip_int16(s0); | |
112 *out++=s0; | |
113 s2 = s1; | 111 s2 = s1; |
114 s1 = s0; | 112 s1 = av_clip_int16(s0); |
113 *out++=s1; | |
115 | 114 |
116 d = in[i]; | 115 d = in[i]; |
117 //d&=15; if (d&8) d-=16; | 116 //d&=15; if (d&8) d-=16; |
118 d = ((signed char)(d<<4) >> 4); | 117 d = ((signed char)(d<<4) >> 4); |
119 s0 = (BASEVOL*d*scale + SCALE1*s1 - SCALE2*s2)>>14; | 118 s0 = (BASEVOL*d*scale + SCALE1*s1 - SCALE2*s2)>>14; |
120 s0 = av_clip_int16(s0); | |
121 *out++=s0; | |
122 s2 = s1; | 119 s2 = s1; |
123 s1 = s0; | 120 s1 = av_clip_int16(s0); |
121 *out++=s1; | |
124 } | 122 } |
125 prev->s1 = s1; | 123 prev->s1 = s1; |
126 prev->s2 = s2; | 124 prev->s2 = s2; |
127 | 125 |
128 } | 126 } |