[xiph-commits] r7009 - in branches/monty-vorbis-aotuv-branch:

[xiphmont at dactyl.lonelymoon.com]

examples lib lib/modes
Message-ID: <20040706050631.8BFCF9AAAB at dactyl.lonelymoon.com>

Author: xiphmont
Date: Mon Jul  5 22:06:31 2004
New Revision: 7009

Modified:
branches/monty-vorbis-aotuv-branch/examples/encoder_example.c
branches/monty-vorbis-aotuv-branch/lib/codec_internal.h
branches/monty-vorbis-aotuv-branch/lib/modes/psych_11.h
branches/monty-vorbis-aotuv-branch/lib/modes/psych_44.h
branches/monty-vorbis-aotuv-branch/lib/modes/setup_44.h
branches/monty-vorbis-aotuv-branch/lib/vorbisenc.c
Log:
Unmanaged (uncoupled and stereo modes) all test good in first pass.

Now to correct the changes made to rate managed modes



Modified: branches/monty-vorbis-aotuv-branch/examples/encoder_example.c
===================================================================
--- branches/monty-vorbis-aotuv-branch/examples/encoder_example.c	2004-07-06 02:14:14 UTC (rev 7008)
+++ branches/monty-vorbis-aotuv-branch/examples/encoder_example.c	2004-07-06 05:05:43 UTC (rev 7009)
@@ -121,12 +121,12 @@
using the bitrate interface, and then turning bitrate management off:

ret = ( vorbis_encode_setup_managed(&vi,2,44100,-1,128000,-1) ||
-           vorbis_encode_ctl(&vi,OV_ECTL_RATEMANAGE_AVG,NULL) ||
+           vorbis_encode_ctl(&vi,OV_ECTL_RATEMANAGE2_SET,NULL) ||
vorbis_encode_setup_init(&vi));

*********************************************************************/

-  ret=vorbis_encode_init_vbr(&vi,2,44100,.1);
+  ret=vorbis_encode_init_vbr(&vi,2,44100,-.1);

/* do not continue if setup failed; this can happen if we ask for a
mode that libVorbis does not support (eg, too low a bitrate, etc,

Modified: branches/monty-vorbis-aotuv-branch/lib/codec_internal.h
===================================================================
--- branches/monty-vorbis-aotuv-branch/lib/codec_internal.h	2004-07-06 02:14:14 UTC (rev 7008)
+++ branches/monty-vorbis-aotuv-branch/lib/codec_internal.h	2004-07-06 05:05:43 UTC (rev 7009)
@@ -18,10 +18,6 @@
#ifndef _V_CODECI_H_
#define _V_CODECI_H_

-#define TRAIN_FLOOR1
-#define TRAIN_RES
-#define TRAIN_RESAUX
-
#include "envelope.h"
#include "codebook.h"


Modified: branches/monty-vorbis-aotuv-branch/lib/modes/psych_11.h
===================================================================
--- branches/monty-vorbis-aotuv-branch/lib/modes/psych_11.h	2004-07-06 02:14:14 UTC (rev 7008)
+++ branches/monty-vorbis-aotuv-branch/lib/modes/psych_11.h	2004-07-06 05:05:43 UTC (rev 7009)
@@ -20,7 +20,7 @@
static att3 _psy_tone_masteratt_11[3]={
{{ 30,  25,  12},  0,   0},  /* 0 */
{{ 30,  25,  12},  0,   0},  /* 0 */
-  {{ 20,   0, -14},  0,  1.}, /* 0 */
+  {{ 20,   0, -14},  0,   0}, /* 0 */
};

static vp_adjblock _vp_tonemask_adj_11[3]={

Modified: branches/monty-vorbis-aotuv-branch/lib/modes/psych_44.h
===================================================================
--- branches/monty-vorbis-aotuv-branch/lib/modes/psych_44.h	2004-07-06 02:14:14 UTC (rev 7008)
+++ branches/monty-vorbis-aotuv-branch/lib/modes/psych_44.h	2004-07-06 05:05:43 UTC (rev 7009)
@@ -592,7 +592,7 @@

/* tone master attenuation by base quality mode and bitrate tweak */
static att3 _psy_tone_masteratt_44[12]={
-  {{ 35,  21,   9},  0, 1.25}, /* -1 */
+  {{ 35,  21,   9},  0,    0}, /* -1 */
{{ 30,  20,   8}, -2, 1.25}, /* 0 */
/*  {{ 25,  14,   4},  0,    0}, *//* 1 */
{{ 23,  12,   2},  0,    0}, /* 1 */

Modified: branches/monty-vorbis-aotuv-branch/lib/modes/setup_44.h
===================================================================
--- branches/monty-vorbis-aotuv-branch/lib/modes/setup_44.h	2004-07-06 02:14:14 UTC (rev 7008)
+++ branches/monty-vorbis-aotuv-branch/lib/modes/setup_44.h	2004-07-06 05:05:43 UTC (rev 7009)
@@ -20,7 +20,7 @@
#include "modes/psych_44.h"

static double rate_mapping_44_stereo[12]={
-  20000,32000.,40000.,48000.,56000.,64000.,
+  22500.,32000.,40000.,48000.,56000.,64000.,
80000.,96000.,112000.,128000.,160000.,250001.
};


Modified: branches/monty-vorbis-aotuv-branch/lib/vorbisenc.c
===================================================================
--- branches/monty-vorbis-aotuv-branch/lib/vorbisenc.c	2004-07-06 02:14:14 UTC (rev 7008)
+++ branches/monty-vorbis-aotuv-branch/lib/vorbisenc.c	2004-07-06 05:05:43 UTC (rev 7009)
@@ -653,6 +653,7 @@
float del=(req-low)/(high-low);
hi->base_setting=j+del;
}
+
return;
}
}
@@ -897,7 +898,7 @@
codec_setup_info *ci=vi->codec_setup;
highlevel_encode_setup *hi=&ci->hi;

-  quality+=.00001;
+  quality+=.0000001;
if(quality>=1.)quality=.9999;

get_setup_template(vi,channels,rate,quality,0);