X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvorbis_enc.c;h=3789ef7a24890d1d6fdf400a42433137acf2283b;hb=ee3035f31e97ac095a9504c032c7320dcd9cfe4b;hp=a466519c680ebf02c81e2dd3c62cfca724b9bd09;hpb=4fb432e743cdfabfcf4ca73c06707e20f4d8fbfe;p=ffmpeg

diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c
index a466519c680..3789ef7a248 100644
--- a/libavcodec/vorbis_enc.c
+++ b/libavcodec/vorbis_enc.c
@@ -1,18 +1,20 @@
 /*
  * copyright (c) 2006 Oded Shimon <ods15@ods15.dyndns.org>
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
@@ -22,27 +24,19 @@
  * @author Oded Shimon <ods15@ods15.dyndns.org>
  */
 
+#include <float.h>
 #include "avcodec.h"
-
-#define BITSTREAM_H // don't include this
-typedef int VLC;
-typedef int GetBitContext;
+#include "dsputil.h"
 #include "vorbis.h"
+#include "vorbis_enc_data.h"
 
 #undef NDEBUG
 #include <assert.h>
 
-//#define ALT_BITSTREAM_WRITER
-//#include "bitstream.h"
-
-typedef struct {
-    int len;
-    uint32_t codeword;
-} cb_entry_t;
-
 typedef struct {
     int nentries;
-    cb_entry_t * entries;
+    uint8_t * lens;
+    uint32_t * codewords;
     int ndimentions;
     float min;
     float delta;
@@ -50,6 +44,7 @@ typedef struct {
     int lookup;
     int * quantlist;
     float * dimentions;
+    float * pow2;
 } codebook_t;
 
 typedef struct {
@@ -67,7 +62,7 @@ typedef struct {
     int multiplier;
     int rangebits;
     int values;
-    struct { int x; } * list;
+    floor1_entry_t * list;
 } floor_t;
 
 typedef struct {
@@ -77,7 +72,8 @@ typedef struct {
     int partition_size;
     int classifications;
     int classbook;
-    int (*books)[8];
+    int8_t (*books)[8];
+    float (*maxes)[2];
 } residue_t;
 
 typedef struct {
@@ -85,6 +81,9 @@ typedef struct {
     int * mux;
     int * floor;
     int * residue;
+    int coupling_steps;
+    int * magnitude;
+    int * angle;
 } mapping_t;
 
 typedef struct {
@@ -95,7 +94,7 @@ typedef struct {
 typedef struct {
     int channels;
     int sample_rate;
-    int blocksize[2]; // in (1<<n) format
+    int log2_blocksize[2];
     MDCTContext mdct[2];
     const float * win[2];
     int have_saved;
@@ -103,6 +102,7 @@ typedef struct {
     float * samples;
     float * floor; // also used for tmp values for mdct
     float * coeffs; // also used for residue after floor
+    float quality;
 
     int ncodebooks;
     codebook_t * codebooks;
@@ -127,8 +127,6 @@ typedef struct {
     uint8_t * buf_ptr;
 } PutBitContext;
 
-#define ilog(i) av_log2(2*(i))
-
 static inline void init_put_bits(PutBitContext * pb, uint8_t * buf, int buffer_len) {
     pb->total = buffer_len * 8;
     pb->total_pos = 0;
@@ -168,62 +166,85 @@ static inline int put_bits_count(PutBitContext * pb) {
     return pb->total_pos;
 }
 
+static inline void put_codeword(PutBitContext * pb, codebook_t * cb, int entry) {
+    assert(entry >= 0);
+    assert(entry < cb->nentries);
+    assert(cb->lens[entry]);
+    put_bits(pb, cb->lens[entry], cb->codewords[entry]);
+}
+
 static int cb_lookup_vals(int lookup, int dimentions, int entries) {
-    if (lookup == 1) {
-        int tmp, i;
-        for (tmp = 0; ; tmp++) {
-                int n = 1;
-                for (i = 0; i < dimentions; i++) n *= tmp;
-                if (n > entries) break;
-        }
-        return tmp - 1;
-    } else if (lookup == 2) return dimentions * entries;
+    if      (lookup == 1) return ff_vorbis_nth_root(entries, dimentions);
+    else if (lookup == 2) return dimentions * entries;
     return 0;
 }
 
 static void ready_codebook(codebook_t * cb) {
-    int h[33] = { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
     int i;
 
-    for (i = 0; i < cb->nentries; i++) {
-        cb_entry_t * e = &cb->entries[i];
-        int j = 0;
-        if (h[0]) h[0] = 0;
-        else {
-            for (j = e->len; j; j--)
-                if (h[j]) break;
-            assert(j);
-        }
-        e->codeword = h[j];
-        h[j] = 0;
-        for (j++; j <= e->len; j++) h[j] = e->codeword | (1 << (j - 1));
-    }
-    for (i = 0; i < 33; i++) assert(!h[i]);
+    ff_vorbis_len2vlc(cb->lens, cb->codewords, cb->nentries);
 
-    if (!cb->lookup) cb->dimentions = NULL;
+    if (!cb->lookup)
+        cb->pow2 = cb->dimentions = NULL;
     else {
         int vals = cb_lookup_vals(cb->lookup, cb->ndimentions, cb->nentries);
         cb->dimentions = av_malloc(sizeof(float) * cb->nentries * cb->ndimentions);
+        cb->pow2 = av_mallocz(sizeof(float) * cb->nentries);
         for (i = 0; i < cb->nentries; i++) {
             float last = 0;
             int j;
             int div = 1;
             for (j = 0; j < cb->ndimentions; j++) {
                 int off;
-                if (cb->lookup == 1) off = (i / div) % vals; // lookup type 1
-                else off = i * cb->ndimentions + j; // lookup type 2
+                if (cb->lookup == 1)
+                    off = (i / div) % vals; // lookup type 1
+                else
+                    off = i * cb->ndimentions + j; // lookup type 2
 
                 cb->dimentions[i * cb->ndimentions + j] = last + cb->min + cb->quantlist[off] * cb->delta;
-                if (cb->seq_p) last = cb->dimentions[i * cb->ndimentions + j];
+                if (cb->seq_p)
+                    last = cb->dimentions[i * cb->ndimentions + j];
+                cb->pow2[i] += cb->dimentions[i * cb->ndimentions + j]*cb->dimentions[i * cb->ndimentions + j];
                 div *= vals;
             }
+            cb->pow2[i] /= 2.;
         }
     }
+}
 
+static void ready_residue(residue_t * rc, venc_context_t * venc) {
+    int i;
+    assert(rc->type == 2);
+    rc->maxes = av_mallocz(sizeof(float[2]) * rc->classifications);
+    for (i = 0; i < rc->classifications; i++) {
+        int j;
+        codebook_t * cb;
+        for (j = 0; j < 8; j++)
+            if (rc->books[i][j] != -1) break;
+        if (j == 8) continue; // zero
+        cb = &venc->codebooks[rc->books[i][j]];
+        assert(cb->ndimentions >= 2);
+        assert(cb->lookup);
+
+        for (j = 0; j < cb->nentries; j++) {
+            float a;
+            if (!cb->lens[j]) continue;
+            a = fabs(cb->dimentions[j * cb->ndimentions]);
+            if (a > rc->maxes[i][0])
+                rc->maxes[i][0] = a;
+            a = fabs(cb->dimentions[j * cb->ndimentions + 1]);
+            if (a > rc->maxes[i][1])
+                rc->maxes[i][1] = a;
+        }
+    }
+    // small bias
+    for (i = 0; i < rc->classifications; i++) {
+        rc->maxes[i][0] += 0.8;
+        rc->maxes[i][1] += 0.8;
+    }
 }
 
 static void create_vorbis_context(venc_context_t * venc, AVCodecContext * avccontext) {
-    codebook_t * cb;
     floor_t * fc;
     residue_t * rc;
     mapping_t * mc;
@@ -231,50 +252,37 @@ static void create_vorbis_context(venc_context_t * venc, AVCodecContext * avccon
 
     venc->channels = avccontext->channels;
     venc->sample_rate = avccontext->sample_rate;
-    venc->blocksize[0] = venc->blocksize[1] = 8;
+    venc->log2_blocksize[0] = venc->log2_blocksize[1] = 11;
 
-    venc->ncodebooks = 10;
+    venc->ncodebooks = sizeof(cvectors)/sizeof(cvectors[0]);
     venc->codebooks = av_malloc(sizeof(codebook_t) * venc->ncodebooks);
 
-    // codebook 0 - floor1 book, values 0..255
-    cb = &venc->codebooks[0];
-    cb->nentries = 256;
-    cb->entries = av_malloc(sizeof(cb_entry_t) * cb->nentries);
-    for (i = 0; i < cb->nentries; i++) cb->entries[i].len = 8;
-    cb->ndimentions = 0;
-    cb->min = 0.;
-    cb->delta = 0.;
-    cb->seq_p = 0;
-    cb->lookup = 0;
-    cb->quantlist = NULL;
-    ready_codebook(cb);
-
-    // codebook 1 - residue classbook, values 0..1, dimentions 4
-    cb = &venc->codebooks[1];
-    cb->nentries = 2;
-    cb->entries = av_malloc(sizeof(cb_entry_t) * cb->nentries);
-    for (i = 0; i < cb->nentries; i++) cb->entries[i].len = 1;
-    cb->ndimentions = 4;
-    cb->min = 0.;
-    cb->delta = 0.;
-    cb->seq_p = 0;
-    cb->lookup = 0;
-    cb->quantlist = NULL;
-    ready_codebook(cb);
-
-    // codebook 2..9 - vector, for the residue, values -32767..32767, dimentions 1
-    for (book = 0; book < 8; book++) {
-        cb = &venc->codebooks[2 + book];
-        cb->nentries = 5;
-        cb->entries = av_malloc(sizeof(cb_entry_t) * cb->nentries);
-        for (i = 0; i < cb->nentries; i++) cb->entries[i].len = i == 2 ? 1 : 3;
-        cb->ndimentions = 1;
-        cb->delta = 1 << ((7 - book) * 2);
-        cb->min = -cb->delta*2;
+    // codebook 0..14 - floor1 book, values 0..255
+    // codebook 15 residue masterbook
+    // codebook 16..29 residue
+    for (book = 0; book < venc->ncodebooks; book++) {
+        codebook_t * cb = &venc->codebooks[book];
+        int vals;
+        cb->ndimentions = cvectors[book].dim;
+        cb->nentries = cvectors[book].real_len;
+        cb->min = cvectors[book].min;
+        cb->delta = cvectors[book].delta;
+        cb->lookup = cvectors[book].lookup;
         cb->seq_p = 0;
-        cb->lookup = 1;
-        cb->quantlist = av_malloc(sizeof(int) * cb_lookup_vals(cb->lookup, cb->ndimentions, cb->nentries));
-        for (i = 0; i < cb->nentries; i++) cb->quantlist[i] = i;
+
+        cb->lens = av_malloc(sizeof(uint8_t) * cb->nentries);
+        cb->codewords = av_malloc(sizeof(uint32_t) * cb->nentries);
+        memcpy(cb->lens, cvectors[book].clens, cvectors[book].len);
+        memset(cb->lens + cvectors[book].len, 0, cb->nentries - cvectors[book].len);
+
+        if (cb->lookup) {
+            vals = cb_lookup_vals(cb->lookup, cb->ndimentions, cb->nentries);
+            cb->quantlist = av_malloc(sizeof(int) * vals);
+            for (i = 0; i < vals; i++)
+                cb->quantlist[i] = cvectors[book].quant[i];
+        } else {
+            cb->quantlist = NULL;
+        }
         ready_codebook(cb);
     }
 
@@ -283,49 +291,75 @@ static void create_vorbis_context(venc_context_t * venc, AVCodecContext * avccon
 
     // just 1 floor
     fc = &venc->floors[0];
-    fc->partitions = 1;
+    fc->partitions = 8;
     fc->partition_to_class = av_malloc(sizeof(int) * fc->partitions);
-    for (i = 0; i < fc->partitions; i++) fc->partition_to_class[i] = 0;
-    fc->nclasses = 1;
+    fc->nclasses = 0;
+    for (i = 0; i < fc->partitions; i++) {
+        static const int a[] = {0,1,2,2,3,3,4,4};
+        fc->partition_to_class[i] = a[i];
+        fc->nclasses = FFMAX(fc->nclasses, fc->partition_to_class[i]);
+    }
+    fc->nclasses++;
     fc->classes = av_malloc(sizeof(floor_class_t) * fc->nclasses);
     for (i = 0; i < fc->nclasses; i++) {
         floor_class_t * c = &fc->classes[i];
         int j, books;
-        c->dim = 1;
-        c->subclass = 0;
-        c->masterbook = 0;
+        c->dim = floor_classes[i].dim;
+        c->subclass = floor_classes[i].subclass;
+        c->masterbook = floor_classes[i].masterbook;
         books = (1 << c->subclass);
         c->books = av_malloc(sizeof(int) * books);
-        for (j = 0; j < books; j++) c->books[j] = 0;
+        for (j = 0; j < books; j++)
+            c->books[j] = floor_classes[i].nbooks[j];
     }
-    fc->multiplier = 1;
-    fc->rangebits = venc->blocksize[0];
+    fc->multiplier = 2;
+    fc->rangebits = venc->log2_blocksize[0] - 1;
 
     fc->values = 2;
     for (i = 0; i < fc->partitions; i++)
         fc->values += fc->classes[fc->partition_to_class[i]].dim;
 
-    fc->list = av_malloc(sizeof(*fc->list) * fc->values);
+    fc->list = av_malloc(sizeof(floor1_entry_t) * fc->values);
     fc->list[0].x = 0;
     fc->list[1].x = 1 << fc->rangebits;
-    for (i = 2; i < fc->values; i++) fc->list[i].x = i * 5;
+    for (i = 2; i < fc->values; i++) {
+        static const int a[] = {
+             93, 23,372,  6, 46,186,750, 14, 33, 65,
+            130,260,556,  3, 10, 18, 28, 39, 55, 79,
+            111,158,220,312,464,650,850
+        };
+        fc->list[i].x = a[i - 2];
+    }
+    ff_vorbis_ready_floor1_list(fc->list, fc->values);
 
     venc->nresidues = 1;
     venc->residues = av_malloc(sizeof(residue_t) * venc->nresidues);
 
     // single residue
     rc = &venc->residues[0];
-    rc->type = 0;
+    rc->type = 2;
     rc->begin = 0;
-    rc->end = 1 << (venc->blocksize[0] - 1);
-    rc->partition_size = 64;
-    rc->classifications = 2;
-    rc->classbook = 1;
-    rc->books = av_malloc(sizeof(int[8]) * rc->classifications);
-    for (i = 0; i < rc->classifications; i++) {
-        int j;
-        for (j = 0; j < 8; j++) rc->books[i][j] = 2 + j;
+    rc->end = 1600;
+    rc->partition_size = 32;
+    rc->classifications = 10;
+    rc->classbook = 15;
+    rc->books = av_malloc(sizeof(*rc->books) * rc->classifications);
+    {
+        static const int8_t a[10][8] = {
+            { -1, -1, -1, -1, -1, -1, -1, -1, },
+            { -1, -1, 16, -1, -1, -1, -1, -1, },
+            { -1, -1, 17, -1, -1, -1, -1, -1, },
+            { -1, -1, 18, -1, -1, -1, -1, -1, },
+            { -1, -1, 19, -1, -1, -1, -1, -1, },
+            { -1, -1, 20, -1, -1, -1, -1, -1, },
+            { -1, -1, 21, -1, -1, -1, -1, -1, },
+            { 22, 23, -1, -1, -1, -1, -1, -1, },
+            { 24, 25, -1, -1, -1, -1, -1, -1, },
+            { 26, 27, 28, -1, -1, -1, -1, -1, },
+        };
+        memcpy(rc->books, a, sizeof a);
     }
+    ready_residue(rc, venc);
 
     venc->nmappings = 1;
     venc->mappings = av_malloc(sizeof(mapping_t) * venc->nmappings);
@@ -334,13 +368,21 @@ static void create_vorbis_context(venc_context_t * venc, AVCodecContext * avccon
     mc = &venc->mappings[0];
     mc->submaps = 1;
     mc->mux = av_malloc(sizeof(int) * venc->channels);
-    for (i = 0; i < venc->channels; i++) mc->mux[i] = 0;
+    for (i = 0; i < venc->channels; i++)
+        mc->mux[i] = 0;
     mc->floor = av_malloc(sizeof(int) * mc->submaps);
     mc->residue = av_malloc(sizeof(int) * mc->submaps);
     for (i = 0; i < mc->submaps; i++) {
         mc->floor[i] = 0;
         mc->residue[i] = 0;
     }
+    mc->coupling_steps = venc->channels == 2 ? 1 : 0;
+    mc->magnitude = av_malloc(sizeof(int) * mc->coupling_steps);
+    mc->angle = av_malloc(sizeof(int) * mc->coupling_steps);
+    if (mc->coupling_steps) {
+        mc->magnitude[0] = 0;
+        mc->angle[0] = 1;
+    }
 
     venc->nmodes = 1;
     venc->modes = av_malloc(sizeof(vorbis_mode_t) * venc->nmodes);
@@ -350,19 +392,16 @@ static void create_vorbis_context(venc_context_t * venc, AVCodecContext * avccon
     venc->modes[0].mapping = 0;
 
     venc->have_saved = 0;
-    venc->saved = av_malloc(sizeof(float) * venc->channels * (1 << venc->blocksize[1]) / 2);
-    venc->samples = av_malloc(sizeof(float) * venc->channels * (1 << venc->blocksize[1]));
-    venc->floor = av_malloc(sizeof(float) * venc->channels * (1 << venc->blocksize[1]) / 2);
-    venc->coeffs = av_malloc(sizeof(float) * venc->channels * (1 << venc->blocksize[1]) / 2);
+    venc->saved = av_malloc(sizeof(float) * venc->channels * (1 << venc->log2_blocksize[1]) / 2);
+    venc->samples = av_malloc(sizeof(float) * venc->channels * (1 << venc->log2_blocksize[1]));
+    venc->floor = av_malloc(sizeof(float) * venc->channels * (1 << venc->log2_blocksize[1]) / 2);
+    venc->coeffs = av_malloc(sizeof(float) * venc->channels * (1 << venc->log2_blocksize[1]) / 2);
 
-    {
-        const float *vwin[8]={ vwin64, vwin128, vwin256, vwin512, vwin1024, vwin2048, vwin4096, vwin8192 };
-        venc->win[0] = vwin[venc->blocksize[0] - 6];
-        venc->win[1] = vwin[venc->blocksize[1] - 6];
-    }
+    venc->win[0] = ff_vorbis_vwin[venc->log2_blocksize[0] - 6];
+    venc->win[1] = ff_vorbis_vwin[venc->log2_blocksize[1] - 6];
 
-    ff_mdct_init(&venc->mdct[0], venc->blocksize[0], 0);
-    ff_mdct_init(&venc->mdct[1], venc->blocksize[1], 0);
+    ff_mdct_init(&venc->mdct[0], venc->log2_blocksize[0], 0);
+    ff_mdct_init(&venc->mdct[1], venc->log2_blocksize[1], 0);
 }
 
 static void put_float(PutBitContext * pb, float f) {
@@ -383,30 +422,35 @@ static void put_codebook_header(PutBitContext * pb, codebook_t * cb) {
     put_bits(pb, 16, cb->ndimentions);
     put_bits(pb, 24, cb->nentries);
 
-    for (i = 1; i < cb->nentries; i++) if (cb->entries[i].len < cb->entries[i-1].len) break;
-    if (i == cb->nentries) ordered = 1;
+    for (i = 1; i < cb->nentries; i++)
+        if (cb->lens[i] < cb->lens[i-1]) break;
+    if (i == cb->nentries)
+        ordered = 1;
 
     put_bits(pb, 1, ordered);
     if (ordered) {
-        int len = cb->entries[0].len;
+        int len = cb->lens[0];
         put_bits(pb, 5, len - 1);
         i = 0;
         while (i < cb->nentries) {
             int j;
-            for (j = 0; j+i < cb->nentries; j++) if (cb->entries[j+i].len != len) break;
+            for (j = 0; j+i < cb->nentries; j++)
+                if (cb->lens[j+i] != len) break;
             put_bits(pb, ilog(cb->nentries - i), j);
             i += j;
             len++;
         }
     } else {
         int sparse = 0;
-        for (i = 0; i < cb->nentries; i++) if (!cb->entries[i].len) break;
-        if (i != cb->nentries) sparse = 1;
+        for (i = 0; i < cb->nentries; i++)
+            if (!cb->lens[i]) break;
+        if (i != cb->nentries)
+            sparse = 1;
         put_bits(pb, 1, sparse);
 
         for (i = 0; i < cb->nentries; i++) {
-            if (sparse) put_bits(pb, 1, !!cb->entries[i].len);
-            if (cb->entries[i].len) put_bits(pb, 5, cb->entries[i].len - 1);
+            if (sparse) put_bits(pb, 1, !!cb->lens[i]);
+            if (cb->lens[i]) put_bits(pb, 5, cb->lens[i] - 1);
         }
     }
 
@@ -415,7 +459,8 @@ static void put_codebook_header(PutBitContext * pb, codebook_t * cb) {
         int tmp = cb_lookup_vals(cb->lookup, cb->ndimentions, cb->nentries);
         int bits = ilog(cb->quantlist[0]);
 
-        for (i = 1; i < tmp; i++) bits = FFMAX(bits, ilog(cb->quantlist[i]));
+        for (i = 1; i < tmp; i++)
+            bits = FFMAX(bits, ilog(cb->quantlist[i]));
 
         put_float(pb, cb->min);
         put_float(pb, cb->delta);
@@ -423,7 +468,8 @@ static void put_codebook_header(PutBitContext * pb, codebook_t * cb) {
         put_bits(pb, 4, bits - 1);
         put_bits(pb, 1, cb->seq_p);
 
-        for (i = 0; i < tmp; i++) put_bits(pb, bits, cb->quantlist[i]);
+        for (i = 0; i < tmp; i++)
+            put_bits(pb, bits, cb->quantlist[i]);
     }
 }
 
@@ -434,7 +480,8 @@ static void put_floor_header(PutBitContext * pb, floor_t * fc) {
 
     put_bits(pb, 5, fc->partitions);
 
-    for (i = 0; i < fc->partitions; i++) put_bits(pb, 4, fc->partition_to_class[i]);
+    for (i = 0; i < fc->partitions; i++)
+        put_bits(pb, 4, fc->partition_to_class[i]);
 
     for (i = 0; i < fc->nclasses; i++) {
         int j, books;
@@ -442,17 +489,20 @@ static void put_floor_header(PutBitContext * pb, floor_t * fc) {
         put_bits(pb, 3, fc->classes[i].dim - 1);
         put_bits(pb, 2, fc->classes[i].subclass);
 
-        if (fc->classes[i].subclass) put_bits(pb, 8, fc->classes[i].masterbook);
+        if (fc->classes[i].subclass)
+            put_bits(pb, 8, fc->classes[i].masterbook);
 
         books = (1 << fc->classes[i].subclass);
 
-        for (j = 0; j < books; j++) put_bits(pb, 8, fc->classes[i].books[j] + 1);
+        for (j = 0; j < books; j++)
+            put_bits(pb, 8, fc->classes[i].books[j] + 1);
     }
 
     put_bits(pb, 2, fc->multiplier - 1);
     put_bits(pb, 4, fc->rangebits);
 
-    for (i = 2; i < fc->values; i++) put_bits(pb, fc->rangebits, fc->list[i].x);
+    for (i = 2; i < fc->values; i++)
+        put_bits(pb, fc->rangebits, fc->list[i].x);
 }
 
 static void put_residue_header(PutBitContext * pb, residue_t * rc) {
@@ -468,18 +518,20 @@ static void put_residue_header(PutBitContext * pb, residue_t * rc) {
 
     for (i = 0; i < rc->classifications; i++) {
         int j, tmp = 0;
-        for (j = 0; j < 8; j++) tmp |= (rc->books[i][j] != -1) << j;
+        for (j = 0; j < 8; j++)
+            tmp |= (rc->books[i][j] != -1) << j;
 
         put_bits(pb, 3, tmp & 7);
         put_bits(pb, 1, tmp > 7);
 
-        if (tmp > 7) put_bits(pb, 5, tmp >> 3);
+        if (tmp > 7)
+            put_bits(pb, 5, tmp >> 3);
     }
 
     for (i = 0; i < rc->classifications; i++) {
         int j;
         for (j = 0; j < 8; j++)
-            if (rc->books[i][j])
+            if (rc->books[i][j] != -1)
                 put_bits(pb, 8, rc->books[i][j]);
     }
 }
@@ -494,15 +546,16 @@ static int put_main_header(venc_context_t * venc, uint8_t ** out) {
     // identification header
     init_put_bits(&pb, p, buffer_len);
     put_bits(&pb, 8, 1); //magic
-    for (i = 0; "vorbis"[i]; i++) put_bits(&pb, 8, "vorbis"[i]);
+    for (i = 0; "vorbis"[i]; i++)
+        put_bits(&pb, 8, "vorbis"[i]);
     put_bits(&pb, 32, 0); // version
     put_bits(&pb, 8, venc->channels);
     put_bits(&pb, 32, venc->sample_rate);
     put_bits(&pb, 32, 0); // bitrate
     put_bits(&pb, 32, 0); // bitrate
     put_bits(&pb, 32, 0); // bitrate
-    put_bits(&pb, 4, venc->blocksize[0]);
-    put_bits(&pb, 4, venc->blocksize[1]);
+    put_bits(&pb, 4, venc->log2_blocksize[0]);
+    put_bits(&pb, 4, venc->log2_blocksize[1]);
     put_bits(&pb, 1, 1); // framing
 
     flush_put_bits(&pb);
@@ -513,7 +566,8 @@ static int put_main_header(venc_context_t * venc, uint8_t ** out) {
     // comment header
     init_put_bits(&pb, p, buffer_len);
     put_bits(&pb, 8, 3); //magic
-    for (i = 0; "vorbis"[i]; i++) put_bits(&pb, 8, "vorbis"[i]);
+    for (i = 0; "vorbis"[i]; i++)
+        put_bits(&pb, 8, "vorbis"[i]);
     put_bits(&pb, 32, 0); // vendor length TODO
     put_bits(&pb, 32, 0); // amount of comments
     put_bits(&pb, 1, 1); // framing
@@ -526,11 +580,13 @@ static int put_main_header(venc_context_t * venc, uint8_t ** out) {
     // setup header
     init_put_bits(&pb, p, buffer_len);
     put_bits(&pb, 8, 5); //magic
-    for (i = 0; "vorbis"[i]; i++) put_bits(&pb, 8, "vorbis"[i]);
+    for (i = 0; "vorbis"[i]; i++)
+        put_bits(&pb, 8, "vorbis"[i]);
 
     // codebooks
     put_bits(&pb, 8, venc->ncodebooks - 1);
-    for (i = 0; i < venc->ncodebooks; i++) put_codebook_header(&pb, &venc->codebooks[i]);
+    for (i = 0; i < venc->ncodebooks; i++)
+        put_codebook_header(&pb, &venc->codebooks[i]);
 
     // time domain, reserved, zero
     put_bits(&pb, 6, 0);
@@ -538,11 +594,13 @@ static int put_main_header(venc_context_t * venc, uint8_t ** out) {
 
     // floors
     put_bits(&pb, 6, venc->nfloors - 1);
-    for (i = 0; i < venc->nfloors; i++) put_floor_header(&pb, &venc->floors[i]);
+    for (i = 0; i < venc->nfloors; i++)
+        put_floor_header(&pb, &venc->floors[i]);
 
     // residues
     put_bits(&pb, 6, venc->nresidues - 1);
-    for (i = 0; i < venc->nresidues; i++) put_residue_header(&pb, &venc->residues[i]);
+    for (i = 0; i < venc->nresidues; i++)
+        put_residue_header(&pb, &venc->residues[i]);
 
     // mappings
     put_bits(&pb, 6, venc->nmappings - 1);
@@ -552,13 +610,23 @@ static int put_main_header(venc_context_t * venc, uint8_t ** out) {
         put_bits(&pb, 16, 0); // mapping type
 
         put_bits(&pb, 1, mc->submaps > 1);
-        if (mc->submaps > 1) put_bits(&pb, 4, mc->submaps - 1);
-
-        put_bits(&pb, 1, 0); // channel coupling
+        if (mc->submaps > 1)
+            put_bits(&pb, 4, mc->submaps - 1);
+
+        put_bits(&pb, 1, !!mc->coupling_steps);
+        if (mc->coupling_steps) {
+            put_bits(&pb, 8, mc->coupling_steps - 1);
+            for (j = 0; j < mc->coupling_steps; j++) {
+                put_bits(&pb, ilog(venc->channels - 1), mc->magnitude[j]);
+                put_bits(&pb, ilog(venc->channels - 1), mc->angle[j]);
+            }
+        }
 
         put_bits(&pb, 2, 0); // reserved
 
-        if (mc->submaps > 1) for (j = 0; j < venc->channels; j++) put_bits(&pb, 4, mc->mux[j]);
+        if (mc->submaps > 1)
+            for (j = 0; j < venc->channels; j++)
+                put_bits(&pb, 4, mc->mux[j]);
 
         for (j = 0; j < mc->submaps; j++) {
             put_bits(&pb, 8, 0); // reserved time configuration
@@ -597,30 +665,228 @@ static int put_main_header(venc_context_t * venc, uint8_t ** out) {
     return p - *out;
 }
 
-static int vorbis_encode_init(AVCodecContext * avccontext)
-{
-    venc_context_t * venc = avccontext->priv_data;
+static float get_floor_average(floor_t * fc, float * coeffs, int i) {
+    int begin = fc->list[fc->list[FFMAX(i-1, 0)].sort].x;
+    int end   = fc->list[fc->list[FFMIN(i+1, fc->values - 1)].sort].x;
+    int j;
+    float average = 0;
 
-    create_vorbis_context(venc, avccontext);
+    for (j = begin; j < end; j++)
+        average += fabs(coeffs[j]);
+    return average / (end - begin);
+}
 
-    //if (avccontext->flags & CODEC_FLAG_QSCALE) avccontext->global_quality / (float)FF_QP2LAMBDA); else avccontext->bit_rate;
-    //if(avccontext->cutoff > 0) cfreq = avccontext->cutoff / 1000.0;
+static void floor_fit(venc_context_t * venc, floor_t * fc, float * coeffs, uint_fast16_t * posts, int samples) {
+    int range = 255 / fc->multiplier + 1;
+    int i;
+    float tot_average = 0.;
+    float averages[fc->values];
+    for (i = 0; i < fc->values; i++){
+        averages[i] = get_floor_average(fc, coeffs, i);
+        tot_average += averages[i];
+    }
+    tot_average /= fc->values;
+    tot_average /= venc->quality;
 
-    avccontext->extradata_size = put_main_header(venc, (uint8_t**)&avccontext->extradata);
+    for (i = 0; i < fc->values; i++) {
+        int position = fc->list[fc->list[i].sort].x;
+        float average = averages[i];
+        int j;
 
-    avccontext->frame_size = 1 << (venc->blocksize[0] - 1);
+        average *= pow(tot_average / average, 0.5) * pow(1.25, position/200.); // MAGIC!
+        for (j = 0; j < range - 1; j++)
+            if (ff_vorbis_floor1_inverse_db_table[j * fc->multiplier] > average) break;
+        posts[fc->list[i].sort] = j;
+    }
+}
 
-    avccontext->coded_frame = avcodec_alloc_frame();
-    avccontext->coded_frame->key_frame = 1;
+static int render_point(int x0, int y0, int x1, int y1, int x) {
+    return y0 +  (x - x0) * (y1 - y0) / (x1 - x0);
+}
 
-    return 0;
+static void floor_encode(venc_context_t * venc, floor_t * fc, PutBitContext * pb, uint_fast16_t * posts, float * floor, int samples) {
+    int range = 255 / fc->multiplier + 1;
+    int coded[fc->values]; // first 2 values are unused
+    int i, counter;
+
+    put_bits(pb, 1, 1); // non zero
+    put_bits(pb, ilog(range - 1), posts[0]);
+    put_bits(pb, ilog(range - 1), posts[1]);
+    coded[0] = coded[1] = 1;
+
+    for (i = 2; i < fc->values; i++) {
+        int predicted = render_point(fc->list[fc->list[i].low].x,
+                                     posts[fc->list[i].low],
+                                     fc->list[fc->list[i].high].x,
+                                     posts[fc->list[i].high],
+                                     fc->list[i].x);
+        int highroom = range - predicted;
+        int lowroom = predicted;
+        int room = FFMIN(highroom, lowroom);
+        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;
+        }
+    }
+
+    counter = 2;
+    for (i = 0; i < fc->partitions; i++) {
+        floor_class_t * c = &fc->classes[fc->partition_to_class[i]];
+        int k, cval = 0, csub = 1<<c->subclass;
+        if (c->subclass) {
+            codebook_t * book = &venc->codebooks[c->masterbook];
+            int cshift = 0;
+            for (k = 0; k < c->dim; k++) {
+                int l;
+                for (l = 0; l < csub; l++) {
+                    int maxval = 1;
+                    if (c->books[l] != -1)
+                        maxval = venc->codebooks[c->books[l]].nentries;
+                    // coded could be -1, but this still works, cause thats 0
+                    if (coded[counter + k] < maxval) break;
+                }
+                assert(l != csub);
+                cval |= l << cshift;
+                cshift += c->subclass;
+            }
+            put_codeword(pb, book, cval);
+        }
+        for (k = 0; k < c->dim; k++) {
+            int book = c->books[cval & (csub-1)];
+            int entry = coded[counter++];
+            cval >>= c->subclass;
+            if (book == -1) continue;
+            if (entry == -1) entry = 0;
+            put_codeword(pb, &venc->codebooks[book], entry);
+        }
+    }
+
+    ff_vorbis_floor1_render_list(fc->list, fc->values, posts, coded, fc->multiplier, floor, samples);
+}
+
+static float * put_vector(codebook_t * book, PutBitContext * pb, float * num) {
+    int i, entry = -1;
+    float distance = FLT_MAX;
+    assert(book->dimentions);
+    for (i = 0; i < book->nentries; i++) {
+        float * vec = book->dimentions + i * book->ndimentions, d = book->pow2[i];
+        int j;
+        if (!book->lens[i]) continue;
+        for (j = 0; j < book->ndimentions; j++)
+            d -= vec[j] * num[j];
+        if (distance > d) {
+            entry = i;
+            distance = d;
+        }
+    }
+    put_codeword(pb, book, entry);
+    return &book->dimentions[entry * book->ndimentions];
+}
+
+static void residue_encode(venc_context_t * venc, residue_t * rc, PutBitContext * pb, float * coeffs, int samples, int real_ch) {
+    int pass, i, j, p, k;
+    int psize = rc->partition_size;
+    int partitions = (rc->end - rc->begin) / psize;
+    int channels = (rc->type == 2) ? 1 : real_ch;
+    int classes[channels][partitions];
+    int classwords = venc->codebooks[rc->classbook].ndimentions;
+
+    assert(rc->type == 2);
+    assert(real_ch == 2);
+    for (p = 0; p < partitions; p++) {
+        float max1 = 0., max2 = 0.;
+        int s = rc->begin + p * psize;
+        for (k = s; k < s + psize; k += 2) {
+            max1 = FFMAX(max1, fabs(coeffs[          k / real_ch]));
+            max2 = FFMAX(max2, fabs(coeffs[samples + k / real_ch]));
+        }
+
+        for (i = 0; i < rc->classifications - 1; i++) {
+            if (max1 < rc->maxes[i][0] && max2 < rc->maxes[i][1]) break;
+        }
+        classes[0][p] = i;
+    }
+
+    for (pass = 0; pass < 8; pass++) {
+        p = 0;
+        while (p < partitions) {
+            if (pass == 0)
+                for (j = 0; j < channels; j++) {
+                    codebook_t * book = &venc->codebooks[rc->classbook];
+                    int entry = 0;
+                    for (i = 0; i < classwords; i++) {
+                        entry *= rc->classifications;
+                        entry += classes[j][p + i];
+                    }
+                    put_codeword(pb, book, entry);
+                }
+            for (i = 0; i < classwords && p < partitions; i++, p++) {
+                for (j = 0; j < channels; j++) {
+                    int nbook = rc->books[classes[j][p]][pass];
+                    codebook_t * book = &venc->codebooks[nbook];
+                    float * buf = coeffs + samples*j + rc->begin + p*psize;
+                    if (nbook == -1) continue;
+
+                    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 {
+                        int s = rc->begin + p * psize, a1, b1;
+                        a1 = (s % real_ch) * samples;
+                        b1 =  s / real_ch;
+                        s = real_ch * samples;
+                        for (k = 0; k < psize; k += book->ndimentions) {
+                            int dim, a2 = a1, b2 = b1;
+                            float vec[book->ndimentions], * pv = vec;
+                            for (dim = book->ndimentions; dim--; ) {
+                                *pv++ = coeffs[a2 + b2];
+                                if ((a2 += samples) == s) {
+                                    a2=0;
+                                    b2++;
+                                }
+                            }
+                            pv = put_vector(book, pb, vec);
+                            for (dim = book->ndimentions; dim--; ) {
+                                coeffs[a1 + b1] -= *pv++;
+                                if ((a1 += samples) == s) {
+                                    a1=0;
+                                    b1++;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
-static int window(venc_context_t * venc, signed short * audio, int samples) {
+static int apply_window_and_mdct(venc_context_t * venc, signed short * audio, int samples) {
     int i, j, channel;
     const float * win = venc->win[0];
-    int window_len = 1 << (venc->blocksize[0] - 1);
-    float n = (float)(1 << venc->blocksize[0]) / 4.;
+    int window_len = 1 << (venc->log2_blocksize[0] - 1);
+    float n = (float)(1 << venc->log2_blocksize[0]) / 4.;
     // FIXME use dsp
 
     if (!venc->have_saved && !samples) return 0;
@@ -640,7 +906,7 @@ static int window(venc_context_t * venc, signed short * audio, int samples) {
             float * offset = venc->samples + channel*window_len*2 + window_len;
             j = channel;
             for (i = 0; i < samples; i++, j += venc->channels)
-                offset[i] = audio[j] / 32768. * win[window_len - i] / n;
+                offset[i] = -audio[j] / 32768. / n * win[window_len - i - 1]; //FIXME find out why the sign has to be fliped
         }
     } else {
         for (channel = 0; channel < venc->channels; channel++) {
@@ -657,7 +923,7 @@ static int window(venc_context_t * venc, signed short * audio, int samples) {
             float * offset = venc->saved + channel*window_len;
             j = channel;
             for (i = 0; i < samples; i++, j += venc->channels)
-                offset[i] = audio[j] / 32768. * win[i] / n;
+                offset[i] = -audio[j] / 32768. / n * win[i]; //FIXME find out why the sign has to be fliped
         }
         venc->have_saved = 1;
     } else {
@@ -666,58 +932,31 @@ static int window(venc_context_t * venc, signed short * audio, int samples) {
     return 1;
 }
 
-static float put_vector(codebook_t * book, PutBitContext * pb, float num) {
-    int i;
-    int entry = -1;
-    float distance = 0;
-    assert(book->dimentions);
-    assert(book->ndimentions == 1);
-    for (i = 0; i < book->nentries; i++) {
-        float d = (book->dimentions[i] - num)*(book->dimentions[i] - num);
-        if (entry == -1 || distance > d) {
-            entry = i;
-            distance = d;
-        }
+static int vorbis_encode_init(AVCodecContext * avccontext)
+{
+    venc_context_t * venc = avccontext->priv_data;
+
+    if (avccontext->channels != 2) {
+        av_log(avccontext, AV_LOG_ERROR, "Current FFmpeg Vorbis encoder only supports 2 channels.\n");
+        return -1;
     }
-    put_bits(pb, book->entries[entry].len, book->entries[entry].codeword);
-    return book->dimentions[entry];
-}
 
-static void residue_encode(venc_context_t * venc, residue_t * rc, PutBitContext * pb, float * coeffs, int samples, int channels) {
-    int pass, i, j, p, k;
-    int psize = rc->partition_size;
-    int partitions = (rc->end - rc->begin) / psize;
-    int classes[channels][partitions];
-    int classwords = venc->codebooks[rc->classbook].ndimentions;
+    create_vorbis_context(venc, avccontext);
 
-    for (pass = 0; pass < 8; pass++) {
-        p = 0;
-        while (p < partitions) {
-            if (pass == 0) for (j = 0; j < channels; j++) {
-                codebook_t * book = &venc->codebooks[rc->classbook];
-                int entry = 0;
-                put_bits(pb, book->entries[entry].len, book->entries[entry].codeword);
-                for (i = classwords; i--; ) {
-                    classes[j][p + i] = entry % rc->classifications;
-                    entry /= rc->classifications;
-                }
-            }
-            for (i = 0; i < classwords && p < partitions; i++, p++) {
-                for (j = 0; j < channels; j++) {
-                    int nbook = rc->books[classes[j][p]][pass];
-                    codebook_t * book = &venc->codebooks[nbook];
-                    float * buf = coeffs + samples*j + rc->begin + p*psize;
+    if (avccontext->flags & CODEC_FLAG_QSCALE)
+        venc->quality = avccontext->global_quality / (float)FF_QP2LAMBDA / 10.;
+    else
+        venc->quality = 1.;
+    venc->quality *= venc->quality;
 
-                    assert(rc->type == 0);
-                    assert(book->ndimentions == 1);
+    avccontext->extradata_size = put_main_header(venc, (uint8_t**)&avccontext->extradata);
 
-                    for (k = 0; k < psize; k++) {
-                        buf[k] -= put_vector(book, pb, buf[k]);
-                    }
-                }
-            }
-        }
-    }
+    avccontext->frame_size = 1 << (venc->log2_blocksize[0] - 1);
+
+    avccontext->coded_frame = avcodec_alloc_frame();
+    avccontext->coded_frame->key_frame = 1;
+
+    return 0;
 }
 
 static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * packets, int buf_size, void *data)
@@ -730,7 +969,8 @@ static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * pack
     PutBitContext pb;
     int i;
 
-    if (!window(venc, audio, samples)) return 0;
+    if (!apply_window_and_mdct(venc, audio, samples)) return 0;
+    samples = 1 << (venc->log2_blocksize[0] - 1);
 
     init_put_bits(&pb, packets, buf_size);
 
@@ -747,35 +987,30 @@ static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * pack
 
     for (i = 0; i < venc->channels; i++) {
         floor_t * fc = &venc->floors[mapping->floor[mapping->mux[i]]];
-        int range = 255 / fc->multiplier + 1;
-        int j;
-        put_bits(&pb, 1, 1); // non zero
-        put_bits(&pb, ilog(range - 1), 113); // magic value - 3.7180282E-05
-        put_bits(&pb, ilog(range - 1), 113); // both sides of X
-        for (j = 0; j < fc->partitions; j++) {
-            floor_class_t * c = &fc->classes[fc->partition_to_class[j]];
-            codebook_t * book = &venc->codebooks[c->books[0]];
-            int entry = 0;
-            int k;
-            for (k = 0; k < c->dim; k++) {
-                put_bits(&pb, book->entries[entry].len, book->entries[entry].codeword);
-            }
-        }
+        uint_fast16_t posts[fc->values];
+        floor_fit(venc, fc, &venc->coeffs[i * samples], posts, samples);
+        floor_encode(venc, fc, &pb, posts, &venc->floor[i * samples], samples);
+    }
 
-        for (j = 0; j < samples; j++) {
-            venc->floor[i * samples + j] = floor1_inverse_db_table[113];
-        }
+    for (i = 0; i < venc->channels * samples; i++) {
+        venc->coeffs[i] /= venc->floor[i];
     }
 
-    for (i = 0; i < venc->channels; i++) {
+    for (i = 0; i < mapping->coupling_steps; i++) {
+        float * mag = venc->coeffs + mapping->magnitude[i] * samples;
+        float * ang = venc->coeffs + mapping->angle[i] * samples;
         int j;
         for (j = 0; j < samples; j++) {
-            venc->coeffs[i * samples + j] /= venc->floor[i * samples + j];
+            float a = ang[j];
+            ang[j] -= mag[j];
+            if (mag[j] > 0) ang[j] = -ang[j];
+            if (ang[j] < 0) mag[j] = a;
         }
     }
 
     residue_encode(venc, &venc->residues[mapping->residue[mapping->mux[0]]], &pb, venc->coeffs, samples, venc->channels);
 
+    flush_put_bits(&pb);
     return (put_bits_count(&pb) + 7) / 8;
 }
 
@@ -785,34 +1020,43 @@ static int vorbis_encode_close(AVCodecContext * avccontext)
     venc_context_t * venc = avccontext->priv_data;
     int i;
 
-    if (venc->codebooks) for (i = 0; i < venc->ncodebooks; i++) {
-        av_freep(&venc->codebooks[i].entries);
-        av_freep(&venc->codebooks[i].quantlist);
-        av_freep(&venc->codebooks[i].dimentions);
-    }
+    if (venc->codebooks)
+        for (i = 0; i < venc->ncodebooks; i++) {
+            av_freep(&venc->codebooks[i].lens);
+            av_freep(&venc->codebooks[i].codewords);
+            av_freep(&venc->codebooks[i].quantlist);
+            av_freep(&venc->codebooks[i].dimentions);
+            av_freep(&venc->codebooks[i].pow2);
+        }
     av_freep(&venc->codebooks);
 
-    if (venc->floors) for (i = 0; i < venc->nfloors; i++) {
-        int j;
-        av_freep(&venc->floors[i].classes);
-        if (venc->floors[i].classes)
-            for (j = 0; j < venc->floors[i].nclasses; j++)
-                av_freep(&venc->floors[i].classes[j].books);
-        av_freep(&venc->floors[i].partition_to_class);
-        av_freep(&venc->floors[i].list);
-    }
+    if (venc->floors)
+        for (i = 0; i < venc->nfloors; i++) {
+            int j;
+            if (venc->floors[i].classes)
+                for (j = 0; j < venc->floors[i].nclasses; j++)
+                    av_freep(&venc->floors[i].classes[j].books);
+            av_freep(&venc->floors[i].classes);
+            av_freep(&venc->floors[i].partition_to_class);
+            av_freep(&venc->floors[i].list);
+        }
     av_freep(&venc->floors);
 
-    if (venc->residues) for (i = 0; i < venc->nresidues; i++) {
-        av_freep(&venc->residues[i].books);
-    }
+    if (venc->residues)
+        for (i = 0; i < venc->nresidues; i++) {
+            av_freep(&venc->residues[i].books);
+            av_freep(&venc->residues[i].maxes);
+        }
     av_freep(&venc->residues);
 
-    if (venc->mappings) for (i = 0; i < venc->nmappings; i++) {
-        av_freep(&venc->mappings[i].mux);
-        av_freep(&venc->mappings[i].floor);
-        av_freep(&venc->mappings[i].residue);
-    }
+    if (venc->mappings)
+        for (i = 0; i < venc->nmappings; i++) {
+            av_freep(&venc->mappings[i].mux);
+            av_freep(&venc->mappings[i].floor);
+            av_freep(&venc->mappings[i].residue);
+            av_freep(&venc->mappings[i].magnitude);
+            av_freep(&venc->mappings[i].angle);
+        }
     av_freep(&venc->mappings);
 
     av_freep(&venc->modes);
@@ -831,7 +1075,7 @@ static int vorbis_encode_close(AVCodecContext * avccontext)
     return 0 ;
 }
 
-AVCodec oggvorbis_encoder = {
+AVCodec vorbis_encoder = {
     "vorbis",
     CODEC_TYPE_AUDIO,
     CODEC_ID_VORBIS,