RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

reverse my last change, it was wrong and broken 

Originally committed as revision 6788 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-10-24 10:13:26 +00:00
parent 46d9fe622d
commit 54fe115921
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/jpeg_ls.c
View File

@ -532,7 +532,7 @@ static inline void ls_encode_regular(JLSState *state, PutBitContext *pb, int Q,
*/ */
static inline void ls_encode_runterm(JLSState *state, PutBitContext *pb, int RItype, int err, int limit_add){ static inline void ls_encode_runterm(JLSState *state, PutBitContext *pb, int RItype, int err, int limit_add){
int k; int k;
int val; int val, map;
int Q = 365 + RItype; int Q = 365 + RItype;
int temp; int temp;
@ -540,13 +540,14 @@ static inline void ls_encode_runterm(JLSState *state, PutBitContext *pb, int RIt
if(RItype) if(RItype)
temp += state->N[Q] >> 1; temp += state->N[Q] >> 1;
for(k = 0; (state->N[Q] << k) < temp; k++); for(k = 0; (state->N[Q] << k) < temp; k++);
if(!k && (2 * state->B[Q] < state->N[Q])) map = 0;
err= -err; if(!k && err && (2 * state->B[Q] < state->N[Q]))
map = 1;
if(err < 0) if(err < 0)
val = - (2 * err) - 1 - RItype; val = - (2 * err) - 1 - RItype + map;
else else
val = 2 * err - RItype; val = 2 * err - RItype - map;
set_ur_golomb_jpegls(pb, val, k, state->limit - limit_add - 1, state->qbpp); set_ur_golomb_jpegls(pb, val, k, state->limit - limit_add - 1, state->qbpp);
if(err < 0) if(err < 0)