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

Original Commit: r64 | ods15 | 2006-09-25 18:39:30 +0300 (Mon, 25 Sep 2006) | 2 lines

Browse Source 
some fixes to floor

Originally committed as revision 6469 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Oded Shimon 2006-10-02 06:07:55 +00:00
parent 09a0d8b3c9
commit 63fc901ec9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/vorbis_enc.c
View File

@ -717,13 +717,16 @@ static void floor_encode(venc_context_t * venc, floor_t * fc, PutBitContext * pb
if (predicted == posts[i]) { if (predicted == posts[i]) {
coded[i] = 0; // must be used later as flag! coded[i] = 0; // must be used later as flag!
continue; 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) {
if (posts[i] - predicted > room) coded[i] = posts[i] - predicted + lowroom; if (posts[i] - predicted > room) coded[i] = posts[i] - predicted + lowroom;
else coded[i] = (posts[i] - predicted) << 1; else coded[i] = (posts[i] - predicted) << 1;
} else { } else {
if (predicted - posts[i] > room) coded[i] = predicted - posts[i] + highroom - 1; 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 @@ static void floor_encode(venc_context_t * venc, floor_t * fc, PutBitContext * pb
assert(!c->subclass); assert(!c->subclass);
for (k = 0; k < c->dim; k++) { for (k = 0; k < c->dim; k++) {
int entry = coded[counter++]; 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 < book->nentries);
assert(entry >= 0); assert(entry >= 0);
put_bits(pb, book->entries[entry].len, book->entries[entry].codeword); put_bits(pb, book->entries[entry].len, book->entries[entry].codeword);