# HG changeset patch # User ods15 # Date 1159769275 0 # Node ID df84b5d1a8c27af3755e974065bce1689428dbb3 # Parent 2c8d1cadd86ee22dfd4c9e35e7bccdc6b0eba17a Original Commit: r64 | ods15 | 2006-09-25 18:39:30 +0300 (Mon, 25 Sep 2006) | 2 lines some fixes to floor diff -r 2c8d1cadd86e -r df84b5d1a8c2 vorbis_enc.c --- a/vorbis_enc.c Mon Oct 02 06:07:53 2006 +0000 +++ b/vorbis_enc.c Mon Oct 02 06:07:55 2006 +0000 @@ -717,13 +717,16 @@ if (predicted == posts[i]) { coded[i] = 0; // must be used later as flag! continue; + } else { + if (!coded[fc->list[i].low]) coded[fc->list[i].low] = -1; + if (!coded[fc->list[i].high]) coded[fc->list[i].high] = -1; } if (posts[i] > predicted) { if (posts[i] - predicted > room) coded[i] = posts[i] - predicted + lowroom; else coded[i] = (posts[i] - predicted) << 1; } else { if (predicted - posts[i] > room) coded[i] = predicted - posts[i] + highroom - 1; - else coded[i] = ((predicted - posts[i]) << 1) + 1; + else coded[i] = ((predicted - posts[i]) << 1) - 1; } } @@ -735,7 +738,7 @@ assert(!c->subclass); for (k = 0; k < c->dim; k++) { int entry = coded[counter++]; - if (entry >= book->nentries || entry < 0) av_log(NULL, AV_LOG_ERROR, "%d %d %d %d \n", entry, book->nentries, counter, fc->values); + if (entry == -1) entry = 0; assert(entry < book->nentries); assert(entry >= 0); put_bits(pb, book->entries[entry].len, book->entries[entry].codeword);