~ubuntu-branches/ubuntu/saucy/mpd/saucy

Committer: Bazaar Package Importer
Author(s): Angel Abad
Date: 2011-02-02 12:26:30 UTC
mfrom: (1.5.11 upstream)
Revision ID: james.westby@ubuntu.com-20110202122630-bdyx8w4k94doz4fs

Tags: 0.16.1-1ubuntu1

* Merge from debian unstable. Remaining changes:
  - debian/control:
    + Don't build-depend on libmikmod2-dev (Debian bug #510675).
    + Move avahi-daemon from Suggests field to Recommends field.
  - debian/mpd.init.d:
    + Read mpd user from mpd.conf.
  - debian/control, debian/rules:
    + Add libmp3lame-dev to the build dependencies and enable lame.

files added:
m4/libwrap.m4

m4/pretty_print.m4

src/AudioCompress

src/AudioCompress/compress.c

src/AudioCompress/compress.h

src/AudioCompress/config.h

src/ape.c

src/ape.h

src/archive/bz2_archive_plugin.c

src/archive/bz2_archive_plugin.h

src/archive/iso9660_archive_plugin.c

src/archive/iso9660_archive_plugin.h

src/archive/zzip_archive_plugin.c

src/archive/zzip_archive_plugin.h

src/archive_plugin.c

src/archive_plugin.h

src/audio_check.c

src/audio_check.h

src/audio_format.c

src/check.h

src/client_event.c

src/client_expire.c

src/client_global.c

src/client_idle.c

src/client_internal.h

src/client_list.c

src/client_new.c

src/client_process.c

src/client_read.c

src/client_write.c

src/decoder/audiofile_decoder_plugin.c

src/decoder/faad_decoder_plugin.c

src/decoder/ffmpeg_decoder_plugin.c

src/decoder/flac_compat.h

src/decoder/flac_decoder_plugin.c

src/decoder/flac_metadata.c

src/decoder/flac_metadata.h

src/decoder/flac_pcm.c

src/decoder/flac_pcm.h

src/decoder/fluidsynth_decoder_plugin.c

src/decoder/gme_decoder_plugin.c

src/decoder/mad_decoder_plugin.c

src/decoder/mikmod_decoder_plugin.c

src/decoder/modplug_decoder_plugin.c

src/decoder/mp4ff_decoder_plugin.c

src/decoder/mpcdec_decoder_plugin.c

src/decoder/mpg123_decoder_plugin.c

src/decoder/oggflac_decoder_plugin.c

src/decoder/sidplay_decoder_plugin.cxx

src/decoder/sndfile_decoder_plugin.c

src/decoder/vorbis_decoder_plugin.c

src/decoder/wavpack_decoder_plugin.c

src/decoder/wildmidi_decoder_plugin.c

src/decoder_plugin.c

src/decoder_print.c

src/decoder_print.h

src/encoder/flac_encoder.c

src/encoder/null_encoder.c

src/encoder/twolame_encoder.c

src/encoder/wave_encoder.c

src/exclude.c

src/exclude.h

src/fd_util.c

src/fd_util.h

src/filter

src/filter/autoconvert_filter_plugin.c

src/filter/autoconvert_filter_plugin.h

src/filter/chain_filter_plugin.c

src/filter/chain_filter_plugin.h

src/filter/convert_filter_plugin.c

src/filter/convert_filter_plugin.h

src/filter/normalize_filter_plugin.c

src/filter/null_filter_plugin.c

src/filter/replay_gain_filter_plugin.c

src/filter/replay_gain_filter_plugin.h

src/filter/route_filter_plugin.c

src/filter/volume_filter_plugin.c

src/filter/volume_filter_plugin.h

src/filter_config.c

src/filter_config.h

src/filter_internal.h

src/filter_plugin.c

src/filter_plugin.h

src/filter_registry.c

src/filter_registry.h

src/glib_compat.h

src/inotify_queue.c

src/inotify_queue.h

src/inotify_source.c

src/inotify_source.h

src/inotify_update.c

src/inotify_update.h

src/input/ffmpeg_input_plugin.c

src/input/ffmpeg_input_plugin.h

src/input_init.c

src/input_init.h

src/input_registry.c

src/input_registry.h

src/main_win32.c

src/mixer/alsa_mixer_plugin.c

src/mixer/oss_mixer_plugin.c

src/mixer/pulse_mixer_plugin.c

src/mixer/pulse_mixer_plugin.h

src/mixer/software_mixer_plugin.c

src/mixer/software_mixer_plugin.h

src/mixer/winmm_mixer_plugin.c

src/mixer_type.c

src/mixer_type.h

src/mpd_error.h

src/open.h

src/output/ffado_output_plugin.c

src/output/fifo_output_plugin.c

src/output/jack_output_plugin.c

src/output/openal_plugin.c

src/output/pulse_output_plugin.c

src/output/pulse_output_plugin.h

src/output/recorder_output_plugin.c

src/output/winmm_output_plugin.c

src/output/winmm_output_plugin.h

src/pcm_byteswap.c

src/pcm_byteswap.h

src/pcm_pack.c

src/pcm_pack.h

src/playlist

src/playlist/asx_playlist_plugin.c

src/playlist/asx_playlist_plugin.h

src/playlist/cue_playlist_plugin.c

src/playlist/cue_playlist_plugin.h

src/playlist/extm3u_playlist_plugin.c

src/playlist/extm3u_playlist_plugin.h

src/playlist/flac_playlist_plugin.c

src/playlist/flac_playlist_plugin.h

src/playlist/lastfm_playlist_plugin.c

src/playlist/lastfm_playlist_plugin.h

src/playlist/m3u_playlist_plugin.c

src/playlist/m3u_playlist_plugin.h

src/playlist/pls_playlist_plugin.c

src/playlist/pls_playlist_plugin.h

src/playlist/rss_playlist_plugin.c

src/playlist/rss_playlist_plugin.h

src/playlist/xspf_playlist_plugin.c

src/playlist/xspf_playlist_plugin.h

src/playlist_any.c

src/playlist_any.h

src/playlist_database.c

src/playlist_database.h

src/playlist_list.c

src/playlist_list.h

src/playlist_mapper.c

src/playlist_mapper.h

src/playlist_plugin.h

src/playlist_queue.c

src/playlist_queue.h

src/playlist_song.c

src/playlist_song.h

src/playlist_vector.c

src/playlist_vector.h

src/refcount.h

src/replay_gain_ape.c

src/replay_gain_ape.h

src/replay_gain_config.c

src/replay_gain_config.h

src/replay_gain_info.c

src/replay_gain_info.h

src/server_socket.c

src/server_socket.h

src/song_update.c

src/tag_rva2.c

src/tag_rva2.h

src/text_file.c

src/text_file.h

src/text_input_stream.c

src/text_input_stream.h

src/tokenizer.c

src/tokenizer.h

src/update_internal.h

src/update_queue.c

src/update_remove.c

src/update_walk.c

test/dump_playlist.c

test/run_convert.c

test/run_filter.c

test/run_inotify.c

test/run_normalize.c

files removed:
doc/sticker.xml

m4/lame.m4

m4/libOggFLAC.m4

src/archive/bz2_plugin.c

src/archive/iso_plugin.c

src/archive/zip_plugin.c

src/buffer2array.c

src/buffer2array.h

src/compress.c

src/compress.h

src/decoder/audiofile_plugin.c

src/decoder/faad_plugin.c

src/decoder/ffmpeg_plugin.c

src/decoder/flac_plugin.c

src/decoder/fluidsynth_plugin.c

src/decoder/mad_plugin.c

src/decoder/mikmod_plugin.c

src/decoder/modplug_plugin.c

src/decoder/mp4ff_plugin.c

src/decoder/mpcdec_plugin.c

src/decoder/oggflac_plugin.c

src/decoder/sidplay_plugin.cxx

src/decoder/vorbis_plugin.c

src/decoder/wavpack_plugin.c

src/decoder/wildmidi_plugin.c

src/input/lastfm_input_plugin.c

src/input/lastfm_input_plugin.h

src/mixer/alsa_mixer.c

src/mixer/oss_mixer.c

src/mixer/pulse_mixer.c

src/normalize.c

src/normalize.h

src/output/fifo_plugin.c

src/output/jack_plugin.c

src/output/pulse_plugin.c

src/replay_gain.c

src/replay_gain.h

files modified:
AUTHORS

INSTALL

Makefile.am

Makefile.in

NEWS

aclocal.m4

autogen.sh

config.h.in

configure

configure.ac

debian/changelog

debian/control

depcomp

doc/doxygen.conf

doc/mpd.1

doc/mpd.conf.5

doc/mpdconf.example

doc/protocol.xml

doc/user.xml

m4/faad.m4

m4/mpd_check_cflag.m4

missing

scripts/test.sh

src/ack.h

src/aiff.c

src/aiff.h

src/archive_api.c

src/archive_api.h

src/archive_internal.h

src/archive_list.c

src/archive_list.h

src/audio.c

src/audio.h

src/audio_format.h

src/audio_parser.c

src/audio_parser.h

src/buffer.c

src/buffer.h

src/chunk.c

src/chunk.h

src/client.c

src/client.h

src/cmdline.c

src/cmdline.h

src/command.c

src/command.h

src/conf.c

src/conf.h

src/crossfade.c

src/crossfade.h

src/cue/cue_tag.c

src/cue/cue_tag.h

src/daemon.c

src/daemon.h

src/database.c

src/database.h

src/dbUtils.c

src/dbUtils.h

src/decoder/_flac_common.c

src/decoder/_flac_common.h

src/decoder/_ogg_common.c

src/decoder/_ogg_common.h

src/decoder_api.c

src/decoder_api.h

src/decoder_buffer.c

src/decoder_buffer.h

src/decoder_command.h

src/decoder_control.c

src/decoder_control.h

src/decoder_internal.c

src/decoder_internal.h

src/decoder_list.c

src/decoder_list.h

src/decoder_plugin.h

src/decoder_thread.c

src/decoder_thread.h

src/directory.c

src/directory.h

src/directory_print.c

src/directory_print.h

src/directory_save.c

src/directory_save.h

src/dirvec.c

src/dirvec.h

src/encoder/lame_encoder.c

src/encoder/vorbis_encoder.c

src/encoder_api.h

src/encoder_list.c

src/encoder_list.h

src/encoder_plugin.h

src/event_pipe.c

src/event_pipe.h

src/fifo_buffer.c

src/fifo_buffer.h

src/gcc.h

src/icy_metadata.c

src/icy_metadata.h

src/icy_server.c

src/icy_server.h

src/idle.c

src/idle.h

src/input/archive_input_plugin.c

src/input/archive_input_plugin.h

src/input/curl_input_plugin.c

src/input/curl_input_plugin.h

src/input/file_input_plugin.c

src/input/file_input_plugin.h

src/input/mms_input_plugin.c

src/input/mms_input_plugin.h

src/input/rewind_input_plugin.c

src/input/rewind_input_plugin.h

src/input_plugin.h

src/input_stream.c

src/input_stream.h

src/listen.c

src/listen.h

src/locate.c

src/locate.h

src/log.c

src/log.h

src/ls.c

src/ls.h

src/main.c

src/main.h

src/mapper.c

src/mapper.h

src/mixer_all.c

src/mixer_all.h

src/mixer_api.c

src/mixer_api.h

src/mixer_control.c

src/mixer_control.h

src/mixer_list.h

src/mixer_plugin.h

src/notify.c

src/notify.h

src/output/alsa_plugin.c

src/output/ao_plugin.c

src/output/httpd_client.c

src/output/httpd_client.h

src/output/httpd_internal.h

src/output/httpd_output_plugin.c

src/output/mvp_plugin.c

src/output/null_plugin.c

src/output/oss_plugin.c

src/output/osx_plugin.c

src/output/pipe_output_plugin.c

src/output/shout_plugin.c

src/output/solaris_output_plugin.c

src/output_all.c

src/output_all.h

src/output_api.h

src/output_command.c

src/output_command.h

src/output_control.c

src/output_control.h

src/output_init.c

src/output_internal.h

src/output_list.c

src/output_list.h

src/output_plugin.h

src/output_print.c

src/output_print.h

src/output_state.c

src/output_state.h

src/output_thread.c

src/output_thread.h

src/page.c

src/page.h

src/path.c

src/path.h

src/pcm_buffer.h

src/pcm_channels.c

src/pcm_channels.h

src/pcm_convert.c

src/pcm_convert.h

src/pcm_dither.c

src/pcm_dither.h

src/pcm_format.c

src/pcm_format.h

src/pcm_mix.c

src/pcm_mix.h

src/pcm_prng.h

src/pcm_resample.c

src/pcm_resample.h

src/pcm_resample_fallback.c

src/pcm_resample_internal.h

src/pcm_resample_libsamplerate.c

src/pcm_utils.h

src/pcm_volume.c

src/pcm_volume.h

src/permission.c

src/permission.h

src/pipe.c

src/pipe.h

src/player_control.c

src/player_control.h

src/player_thread.c

src/player_thread.h

src/playlist.c

src/playlist.h

src/playlist_control.c

src/playlist_edit.c

src/playlist_global.c

src/playlist_internal.h

src/playlist_print.c

src/playlist_print.h

src/playlist_save.c

src/playlist_save.h

src/playlist_state.c

src/playlist_state.h

src/poison.h

src/queue.c

src/queue.h

src/queue_print.c

src/queue_print.h

src/queue_save.c

src/queue_save.h

src/riff.c

src/riff.h

src/sig_handlers.c

src/sig_handlers.h

src/socket_util.c

src/socket_util.h

src/song.c

src/song.h

src/song_print.c

src/song_print.h

src/song_save.c

src/song_save.h

src/song_sticker.c

src/song_sticker.h

src/songvec.c

src/songvec.h

src/state_file.c

src/state_file.h

src/stats.c

src/stats.h

src/sticker.c

src/sticker.h

src/sticker_print.c

src/sticker_print.h

src/stored_playlist.c

src/stored_playlist.h

src/strset.c

src/strset.h

src/tag.c

src/tag.h

src/tag_ape.c

src/tag_ape.h

src/tag_id3.c

src/tag_id3.h

src/tag_internal.h

src/tag_pool.c

src/tag_pool.h

src/tag_print.c

src/tag_print.h

src/tag_save.c

src/tag_save.h

src/timer.c

src/timer.h

src/update.c

src/update.h

src/uri.c

src/uri.h

src/utils.c

src/utils.h

src/volume.c

src/volume.h

src/zeroconf-avahi.c

src/zeroconf-bonjour.c

src/zeroconf-internal.h

src/zeroconf.c

src/zeroconf.h

test/read_conf.c

test/read_mixer.c

test/read_tags.c

test/run_decoder.c

test/run_encoder.c

test/run_input.c

test/run_output.c

test/software_volume.c

Show diffs side-by-side

added added

removed removed

src/compress.c

* http://www.musicpd.org

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

* the Free Software Foundation; either version 2 of the License, or

* (at your option) any later version.

* This program is distributed in the hope that it will be useful,

* but WITHOUT ANY WARRANTY; without even the implied warranty of

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

* GNU General Public License for more details.

* You should have received a copy of the GNU General Public License along

* with this program; if not, write to the Free Software Foundation, Inc.,

* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

* Imported from AudioCompress by J. Shagam <fluffy@beesbuzz.biz>

#include "compress.h"

#include <glib.h>

#include <stdint.h>

#include <string.h>

#ifdef USE_X

#include <X11/Xlib.h>

#include <X11/Xutil.h>

static Display *display;

static Window window;

static Visual *visual;

static int screen;

static GC blackGC, whiteGC, blueGC, yellowGC, dkyellowGC, redGC;

#endif

static int *peaks;

static int gainCurrent, gainTarget;

static struct {

int show_mon;

int anticlip;

int target;

int gainmax;

int gainsmooth;

unsigned buckets;

} prefs;

#ifdef USE_X

static int mon_init;

#endif

void CompressCfg(int show_mon, int anticlip, int target, int gainmax,

int gainsmooth, unsigned buckets)

{

static unsigned lastsize;

prefs.show_mon = show_mon;

prefs.anticlip = anticlip;

prefs.target = target;

prefs.gainmax = gainmax;

prefs.gainsmooth = gainsmooth;

prefs.buckets = buckets;

/* Allocate the peak structure */

peaks = g_realloc(peaks, sizeof(int)*prefs.buckets);

if (prefs.buckets > lastsize)

memset(peaks + lastsize, 0, sizeof(int)*(prefs.buckets

- lastsize));

lastsize = prefs.buckets;

#ifdef USE_X

/* Configure the monitor window if needed */

if (show_mon && !mon_init)

{

display = XOpenDisplay(getenv("DISPLAY"));

/* We really shouldn't try to init X if there's no X */

if (!display)

{

fprintf(stderr,

"X not detected; disabling monitor window\n");

show_mon = prefs.show_mon = 0;

}

if (show_mon && !mon_init)

{

XGCValues gcv;

XColor col;

gainCurrent = gainTarget = (1 << GAINSHIFT);

100

101

102

screen = DefaultScreen(display);

103

visual = DefaultVisual(display, screen);

104

window = XCreateSimpleWindow(display,

105

RootWindow(display, screen),

106

0, 0, prefs.buckets, 128 + 8, 0,

107

BlackPixel(display, screen),

108

WhitePixel(display, screen));

109

XStoreName(display, window, "AudioCompress monitor");

110

111

gcv.foreground = BlackPixel(display, screen);

112

blackGC = XCreateGC(display, window, GCForeground, &gcv);

113

gcv.foreground = WhitePixel(display, screen);

114

whiteGC = XCreateGC(display, window, GCForeground, &gcv);

115

col.red = 0;

116

col.green = 0;

117

col.blue = 65535;

118

XAllocColor(display, DefaultColormap(display, screen), &col);

119

gcv.foreground = col.pixel;

120

blueGC = XCreateGC(display, window, GCForeground, &gcv);

121

col.red = 65535;

122

col.green = 65535;

123

col.blue = 0;

124

XAllocColor(display, DefaultColormap(display, screen), &col);

125

gcv.foreground = col.pixel;

126

yellowGC = XCreateGC(display, window, GCForeground, &gcv);

127

col.red = 32767;

128

col.green = 32767;

129

col.blue = 0;

130

XAllocColor(display, DefaultColormap(display, screen), &col);

131

gcv.foreground = col.pixel;

132

dkyellowGC = XCreateGC(display, window, GCForeground, &gcv);

133

col.red = 65535;

134

col.green = 0;

135

col.blue = 0;

136

XAllocColor(display, DefaultColormap(display, screen), &col);

137

gcv.foreground = col.pixel;

138

redGC = XCreateGC(display, window, GCForeground, &gcv);

139

mon_init = 1;

140

}

141

142

if (mon_init)

143

{

144

if (show_mon)

145

XMapWindow(display, window);

146

else

147

XUnmapWindow(display, window);

148

XResizeWindow(display, window, prefs.buckets, 128 + 8);

149

XFlush(display);

150

}

151

#endif

152

}

153

154

void CompressFree(void)

155

{

156

#ifdef USE_X

157

if (mon_init)

158

{

159

XFreeGC(display, blackGC);

160

XFreeGC(display, whiteGC);

161

XFreeGC(display, blueGC);

162

XFreeGC(display, yellowGC);

163

XFreeGC(display, dkyellowGC);

164

XFreeGC(display, redGC);

165

XDestroyWindow(display, window);

166

XCloseDisplay(display);

167

}

168

#endif

169

170

g_free(peaks);

171

}

172

173

void CompressDo(void *data, unsigned int length)

174

{

175

int16_t *audio = (int16_t *)data, *ap;

176

int peak;

177

unsigned int i, pos;

178

int gr, gf, gn;

179

static int pn = -1;

180

#ifdef STATS

181

static int clip;

182

#endif

183

static int clipped;

184

185

if (!peaks)

186

return;

187

188

if (pn == -1)

189

{

190

for (i = 0; i < prefs.buckets; i++)

191

peaks[i] = 0;

192

}

193

pn = (pn + 1)%prefs.buckets;

194

195

#ifdef DEBUG

196

fprintf(stderr, "modifyNative16(0x%08x, %d)\n",(unsigned int)data,

197

length);

198

#endif

199

200

/* Determine peak's value and position */

201

peak = 1;

202

pos = 0;

203

204

#ifdef DEBUG

205

fprintf(stderr, "finding peak(b=%d)\n", pn);

206

#endif

207

208

ap = audio;

209

for (i = 0; i < length/2; i++)

210

{

211

int val = *ap;

212

if (val > peak)

213

{

214

peak = val;

215

pos = i;

216

} else if (-val > peak)

217

{

218

peak = -val;

219

pos = i;

220

}

221

ap++;

222

}

223

peaks[pn] = peak;

224

225

/* Only draw if needed, of course */

226

#ifdef USE_X

227

if (prefs.show_mon)

228

{

229

/* current amplitude */

230

XDrawLine(display, window, whiteGC,

231

pn, 0,

232

pn,

233

127 -

234

(peaks[pn]*gainCurrent >> (GAINSHIFT + 8)));

235

236

/* amplification */

237

XDrawLine(display, window, yellowGC,

238

pn,

239

127 - (peaks[pn]*gainCurrent

240

>> (GAINSHIFT + 8)),

241

pn, 127);

242

243

/* peak */

244

XDrawLine(display, window, blackGC,

245

pn, 127 - (peaks[pn] >> 8), pn, 127);

246

247

/* clip indicator */

248

if (clipped)

249

XDrawLine(display, window, redGC,

250

(pn + prefs.buckets - 1)%prefs.buckets,

251

126 - clipped/(length*512),

252

(pn + prefs.buckets - 1)%prefs.buckets,

253

127);

254

clipped = 0;

255

256

/* target line */

257

/* XDrawPoint(display, window, redGC, */

258

/* pn, 127 - TARGET/256); */

259

/* amplification edge */

260

XDrawLine(display, window, dkyellowGC,

261

pn,

262

127 - (peaks[pn]*gainCurrent

263

>> (GAINSHIFT + 8)),

264

pn - 1,

265

127 -

266

(peaks[(pn + prefs.buckets

267

- 1)%prefs.buckets]*gainCurrent

268

>> (GAINSHIFT + 8)));

269

}

270

#endif

271

272

for (i = 0; i < prefs.buckets; i++)

273

{

274

if (peaks[i] > peak)

275

{

276

peak = peaks[i];

277

pos = 0;

278

}

279

}

280

281

/* Determine target gain */

282

gn = (1 << GAINSHIFT)*prefs.target/peak;

283

284

if (gn <(1 << GAINSHIFT))

285

gn = 1 << GAINSHIFT;

286

287

gainTarget = (gainTarget *((1 << prefs.gainsmooth) - 1) + gn)

288

>> prefs.gainsmooth;

289

290

/* Give it an extra insignifigant nudge to counteract possible

291

** rounding error

292

293

294

if (gn < gainTarget)

295

gainTarget--;

296

else if (gn > gainTarget)

297

gainTarget++;

298

299

if (gainTarget > prefs.gainmax << GAINSHIFT)

300

gainTarget = prefs.gainmax << GAINSHIFT;

301

302

303

#ifdef USE_X

304

if (prefs.show_mon)

305

{

306

int x;

307

308

/* peak*gain */

309

XDrawPoint(display, window, redGC,

310

pn,

311

127 - (peak*gainCurrent

312

>> (GAINSHIFT + 8)));

313

314

/* gain indicator */

315

XFillRectangle(display, window, whiteGC, 0, 128,

316

prefs.buckets, 8);

317

x = (gainTarget - (1 << GAINSHIFT))*prefs.buckets

318

/ ((prefs.gainmax - 1) << GAINSHIFT);

319

XDrawLine(display, window, redGC, x,

320

128, x, 128 + 8);

321

322

x = (gn - (1 << GAINSHIFT))*prefs.buckets

323

/ ((prefs.gainmax - 1) << GAINSHIFT);

324

325

XDrawLine(display, window, blackGC,

326

x, 132 - 1,

327

x, 132 + 1);

328

329

/* blue peak line */

330

XDrawLine(display, window, blueGC,

331

0, 127 - (peak >> 8), prefs.buckets,

332

127 - (peak >> 8));

333

XFlush(display);

334

XDrawLine(display, window, whiteGC,

335

0, 127 - (peak >> 8), prefs.buckets,

336

127 - (peak >> 8));

337

}

338

#endif

339

340

/* See if a peak is going to clip */

341

gn = (1 << GAINSHIFT)*32768/peak;

342

343

if (gn < gainTarget)

344

{

345

gainTarget = gn;

346

347

if (prefs.anticlip)

348

pos = 0;

349

350

} else

351

{

352

/* We're ramping up, so draw it out over the whole frame */

353

pos = length;

354

}

355

356

/* Determine gain rate necessary to make target */

357

if (!pos)

358

pos = 1;

359

360

gr = ((gainTarget - gainCurrent) << 16)/(int)pos;

361

362

/* Do the shiznit */

363

gf = gainCurrent << 16;

364

365

#ifdef STATS

366

fprintf(stderr, "\rgain = %2.2f%+.2e ",

367

gainCurrent*1.0/(1 << GAINSHIFT),

368

(gainTarget - gainCurrent)*1.0/(1 << GAINSHIFT));

369

#endif

370

371

ap = audio;

372

for (i = 0; i < length/2; i++)

373

{

374

int sample;

375

376

/* Interpolate the gain */

377

gainCurrent = gf >> 16;

378

if (i < pos)

379

gf += gr;

380

else if (i == pos)

381

gf = gainTarget << 16;

382

383

/* Amplify */

384

sample = (*ap)*gainCurrent >> GAINSHIFT;

385

if (sample < -32768)

386

{

387

#ifdef STATS

388

clip++;

389

#endif

390

clipped += -32768 - sample;

391

sample = -32768;

392

} else if (sample > 32767)

393

{

394

#ifdef STATS

395

clip++;

396

#endif

397

clipped += sample - 32767;

398

sample = 32767;

399

}

400

*ap++ = sample;

401

}

402

#ifdef STATS

403

fprintf(stderr, "clip %d b%-3d ", clip, pn);

404

#endif

405

406

#ifdef DEBUG

407

fprintf(stderr, "\ndone\n");

408

#endif

409

}

410

Older »