generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'shariman/wmall'

Browse Source 
* shariman/wmall:
  call revert_cdlms()
  Fix some loop conditions to prevent overreads
  Initialize pred in lms_predict()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-11-22 21:32:05 +01:00
commit b429440d85
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/wmalosslessdec.c
View File

@ -789,7 +789,7 @@ static void reset_codec(WmallDecodeCtx *s)
static int lms_predict(WmallDecodeCtx *s, int ich, int ilms) static int lms_predict(WmallDecodeCtx *s, int ich, int ilms)
{ {
int32_t pred, icoef; int32_t pred = 0, icoef;
int recent = s->cdlms[ich][ilms].recent; int recent = s->cdlms[ich][ilms].recent;
for (icoef = 0; icoef < s->cdlms[ich][ilms].order; icoef++) for (icoef = 0; icoef < s->cdlms[ich][ilms].order; icoef++)
@ -857,7 +857,7 @@ static void use_high_update_speed(WmallDecodeCtx *s, int ich)
{ {
int ilms, recent, icoef; int ilms, recent, icoef;
s->update_speed[ich] = 16; s->update_speed[ich] = 16;
for (ilms = s->cdlms_ttl[ich]; ilms >= 0; ilms--) { for (ilms = s->cdlms_ttl[ich] - 1; ilms >= 0; ilms--) {
recent = s->cdlms[ich][ilms].recent; recent = s->cdlms[ich][ilms].recent;
if (s->bV3RTM) { if (s->bV3RTM) {
for (icoef = 0; icoef < s->cdlms[ich][ilms].order; icoef++) for (icoef = 0; icoef < s->cdlms[ich][ilms].order; icoef++)
@ -873,7 +873,7 @@ static void use_normal_update_speed(WmallDecodeCtx *s, int ich)
{ {
int ilms, recent, icoef; int ilms, recent, icoef;
s->update_speed[ich] = 8; s->update_speed[ich] = 8;
for (ilms = s->cdlms_ttl[ich]; ilms >= 0; ilms--) { for (ilms = s->cdlms_ttl[ich] - 1; ilms >= 0; ilms--) {
recent = s->cdlms[ich][ilms].recent; recent = s->cdlms[ich][ilms].recent;
if (s->bV3RTM) { if (s->bV3RTM) {
for (icoef = 0; icoef < s->cdlms[ich][ilms].order; icoef++) for (icoef = 0; icoef < s->cdlms[ich][ilms].order; icoef++)
@ -901,7 +901,7 @@ static void revert_cdlms(WmallDecodeCtx *s, int tile_size)
s->transient[ich] = 1; s->transient[ich] = 1;
use_high_update_speed(s, ich); use_high_update_speed(s, ich);
} }
for (ilms = num_lms; ilms >= 0; ilms--) { for (ilms = num_lms - 1; ilms >= 0; ilms--) {
pred = lms_predict(s, ich, ilms); pred = lms_predict(s, ich, ilms);
channel_coeff += pred; channel_coeff += pred;
lms_update(s, ich, ilms, channel_coeff, pred); lms_update(s, ich, ilms, channel_coeff, pred);
@ -1044,6 +1044,7 @@ static int decode_subframe(WmallDecodeCtx *s)
if(s->is_channel_coded[i]) if(s->is_channel_coded[i])
decode_channel_residues(s, i, subframe_len); decode_channel_residues(s, i, subframe_len);
} }
revert_cdlms(s, subframe_len);
/** handled one subframe */ /** handled one subframe */