comparison vorbis_enc.c @ 3889:a0462572fefa libavcodec

Original Commit: r90 | ods15 | 2006-09-29 22:14:40 +0300 (Fri, 29 Sep 2006) | 3 lines much better magic for floor, the first psychoacoustic in this encoder! now creates valid, 175kbps audio, which sounds good! :)

3888:e89e213459cf

        int position = fc->list[fc->list[i].sort].x;
        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;
        begin = (position + begin) / 2;
        end   = (position + end  ) / 2;

        assert(end <= samples);
        for (j = begin; j < end; j++) average += fabs(coeffs[j]);
        average /= end - begin;
        average /= 32; // MAGIC!
        for (j = 0; j < range - 1; j++) if (floor1_inverse_db_table[j * fc->multiplier] > average) break;
        posts[fc->list[i].sort] = j;
    }
}

3889:a0462572fefa

        int position = fc->list[fc->list[i].sort].x;
        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;

        assert(end <= samples);
        for (j = begin; j < end; j++) average += fabs(coeffs[j]);
        average /= end - begin;
        average /= pow(4, 1 - position/400.); // MAGIC!
        for (j = 0; j < range - 1; j++) if (floor1_inverse_db_table[j * fc->multiplier] > average) break;
        posts[fc->list[i].sort] = j;
    }
}