1 diff -Naur faac-1.28/libfaac/frame.c ../build.debug/contrib/faac/faac-1.28/libfaac/frame.c
2 --- faac-1.28.orig/libfaac/frame.c 2004-11-17 06:26:06.000000000 -0800
3 +++ faac-1.28/libfaac/frame.c 2010-04-10 12:26:28.200614437 -0700
14 config->bitRate = tmpbitRate * hEncoder->sampleRate / 44100;
17 - if (config->bandWidth > bwbase)
18 - config->bandWidth = bwbase;
21 hEncoder->config.bitRate = config->bitRate;
23 if (!config->bandWidth)
25 config->bandWidth = (config->quantqual - 100) * bwmult + bwbase;
26 + config->bandWidth *= (double)hEncoder->sampleRate / 44100;
29 hEncoder->config.bandWidth = config->bandWidth;
31 if (hEncoder->config.bandWidth > (hEncoder->sampleRate / 2))
32 hEncoder->config.bandWidth = hEncoder->sampleRate / 2;
34 - if (config->quantqual > 500)
35 - config->quantqual = 500;
36 + if (config->quantqual > 700)
37 + config->quantqual = 700;
38 if (config->quantqual < 10)
39 config->quantqual = 10;
42 hEncoder->config.useTns = 0;
43 hEncoder->config.bitRate = 0; /* default bitrate / channel */
44 hEncoder->config.bandWidth = bwfac * hEncoder->sampleRate;
45 - if (hEncoder->config.bandWidth > bwbase)
46 - hEncoder->config.bandWidth = bwbase;
47 hEncoder->config.quantqual = 100;
48 hEncoder->config.psymodellist = (psymodellist_t *)psymodellist;
49 hEncoder->config.psymodelidx = 0;
51 if (((diff > 0) && (fix > 0.0)) || ((diff < 0) && (fix < 0.0)))
53 hEncoder->aacquantCfg.quality *= (1.0 - fix);
54 - if (hEncoder->aacquantCfg.quality > 300)
55 - hEncoder->aacquantCfg.quality = 300;
56 + if (hEncoder->aacquantCfg.quality > 700)
57 + hEncoder->aacquantCfg.quality = 700;
58 if (hEncoder->aacquantCfg.quality < 50)
59 hEncoder->aacquantCfg.quality = 50;