comparison vorbis_enc.c @ 3864:df84b5d1a8c2 libavcodec

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

3863:2c8d1cadd86e

        int lowroom = predicted;
        int room = FFMIN(highroom, lowroom);
        if (predicted == posts[i]) {
            coded[i] = 0; // must be used later as flag!
            continue;
        }
        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++) {

        codebook_t * book = &venc->codebooks[c->books[0]];
        int k;
        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);
            assert(entry < book->nentries);
            assert(entry >= 0);
            put_bits(pb, book->entries[entry].len, book->entries[entry].codeword);
        }
    }

3864:df84b5d1a8c2

        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++) {

        codebook_t * book = &venc->codebooks[c->books[0]];
        int k;
        assert(!c->subclass);
        for (k = 0; k < c->dim; k++) {
            int entry = coded[counter++];
            if (entry == -1) entry = 0;
            assert(entry < book->nentries);
            assert(entry >= 0);
            put_bits(pb, book->entries[entry].len, book->entries[entry].codeword);
        }
    }