|
Lines 16-22
Link Here
|
| 16 |
* License along with this library; if not, write to the Free Software |
16 |
* License along with this library; if not, write to the Free Software |
| 17 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 18 |
* |
18 |
* |
| 19 |
* $Id: frame.c,v 1.67 2004/11/17 14:26:06 menno Exp $ |
19 |
* $Id: frame.c,v 1.68 2009/06/05 16:09:38 menno Exp $ |
| 20 |
*/ |
20 |
*/ |
| 21 |
|
21 |
|
| 22 |
/* |
22 |
/* |
|
Lines 196-201
Link Here
|
| 196 |
{47000, 10000}, |
196 |
{47000, 10000}, |
| 197 |
{64000, 16000}, |
197 |
{64000, 16000}, |
| 198 |
{76000, 20000}, |
198 |
{76000, 20000}, |
|
|
199 |
{160000, 20000}, |
| 199 |
#endif |
200 |
#endif |
| 200 |
{0, 0} |
201 |
{0, 0} |
| 201 |
}; |
202 |
}; |
|
Lines 242-249
Link Here
|
| 242 |
config->bitRate = tmpbitRate * hEncoder->sampleRate / 44100; |
243 |
config->bitRate = tmpbitRate * hEncoder->sampleRate / 44100; |
| 243 |
#endif |
244 |
#endif |
| 244 |
|
245 |
|
| 245 |
if (config->bandWidth > bwbase) |
|
|
| 246 |
config->bandWidth = bwbase; |
| 247 |
} |
246 |
} |
| 248 |
|
247 |
|
| 249 |
hEncoder->config.bitRate = config->bitRate; |
248 |
hEncoder->config.bitRate = config->bitRate; |
|
Lines 328-335
Link Here
|
| 328 |
hEncoder->config.useTns = 0; |
327 |
hEncoder->config.useTns = 0; |
| 329 |
hEncoder->config.bitRate = 0; /* default bitrate / channel */ |
328 |
hEncoder->config.bitRate = 0; /* default bitrate / channel */ |
| 330 |
hEncoder->config.bandWidth = bwfac * hEncoder->sampleRate; |
329 |
hEncoder->config.bandWidth = bwfac * hEncoder->sampleRate; |
| 331 |
if (hEncoder->config.bandWidth > bwbase) |
|
|
| 332 |
hEncoder->config.bandWidth = bwbase; |
| 333 |
hEncoder->config.quantqual = 100; |
330 |
hEncoder->config.quantqual = 100; |
| 334 |
hEncoder->config.psymodellist = (psymodellist_t *)psymodellist; |
331 |
hEncoder->config.psymodellist = (psymodellist_t *)psymodellist; |
| 335 |
hEncoder->config.psymodelidx = 0; |
332 |
hEncoder->config.psymodelidx = 0; |
|
Lines 1116-1121
Link Here
|
| 1116 |
|
1113 |
|
| 1117 |
/* |
1114 |
/* |
| 1118 |
$Log: frame.c,v $ |
1115 |
$Log: frame.c,v $ |
|
|
1116 |
Revision 1.68 2009/06/05 16:09:38 menno |
| 1117 |
Allow higher bitrates |
| 1118 |
|
| 1119 |
Revision 1.67 2004/11/17 14:26:06 menno |
1119 |
Revision 1.67 2004/11/17 14:26:06 menno |
| 1120 |
Infinite loop fix |
1120 |
Infinite loop fix |
| 1121 |
dunno if this is good, encoder might be tuned to use energies from before MS encoding. But since the MS encoded samples are used in quantisation this might actually be better. Please test. |
1121 |
dunno if this is good, encoder might be tuned to use energies from before MS encoding. But since the MS encoded samples are used in quantisation this might actually be better. Please test. |
