Mercurial > libavcodec.hg
changeset 3871:7fffd3ab056a libavcodec
Original Commit: r71 | ods15 | 2006-09-28 21:00:24 +0300 (Thu, 28 Sep 2006) | 2 lines
residue type 2
| author | ods15 |
|---|---|
| date | Mon, 02 Oct 2006 06:08:11 +0000 |
| parents | 986fb3b8fe60 |
| children | 9f99e471bf72 |
| files | vorbis_enc.c |
| diffstat | 1 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/vorbis_enc.c Mon Oct 02 06:08:09 2006 +0000 +++ b/vorbis_enc.c Mon Oct 02 06:08:11 2006 +0000 @@ -807,6 +807,9 @@ int partitions = (rc->end - rc->begin) / psize; int classes[channels][partitions]; int classwords = venc->codebooks[rc->classbook].ndimentions; + int real_ch = channels; + + if (rc->type == 2) channels = 1; for (pass = 0; pass < 8; pass++) { p = 0; @@ -827,14 +830,26 @@ float * buf = coeffs + samples*j + rc->begin + p*psize; if (nbook == -1) continue; - assert(rc->type == 0); + assert(rc->type == 0 || rc->type == 2); assert(!(psize % book->ndimentions)); + if (rc->type == 0) { for (k = 0; k < psize; k += book->ndimentions) { float * a = put_vector(book, pb, &buf[k]); int l; for (l = 0; l < book->ndimentions; l++) buf[k + l] -= a[l]; } + } else { + for (k = 0; k < psize; k += book->ndimentions) { + int dim = book->ndimentions, s = rc->begin + p * psize, l; + float vec[dim], * pvec = vec, * a; + for (l = s + k; l < s + k + dim; l++) + *pvec++ = coeffs[(l % real_ch) * samples + l / real_ch]; + a = put_vector(book, pb, vec); + for (l = s + k; l < s + k + dim; l++) + coeffs[(l % real_ch) * samples + l / real_ch] -= *a++; + } + } } } }