~ubuntu-branches/ubuntu/trusty/mpd/trusty

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/decoder_api.c

* http://www.musicpd.org

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

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

#include "config.h"

#include "decoder_api.h"

#include "decoder_internal.h"

#include "decoder_control.h"

#include "audio.h"

#include "song.h"

#include "buffer.h"

#include "normalize.h"

#include "pipe.h"

#include "chunk.h"

#include "replay_gain_config.h"

#include <glib.h>

#undef G_LOG_DOMAIN

#define G_LOG_DOMAIN "decoder"

void decoder_initialized(G_GNUC_UNUSED struct decoder * decoder,

const struct audio_format *audio_format,

bool seekable, float total_time)

void

decoder_initialized(struct decoder *decoder,

const struct audio_format *audio_format,

bool seekable, float total_time)

{

assert(dc.state == DECODE_STATE_START);

assert(dc.pipe != NULL);

struct decoder_control *dc = decoder->dc;

struct audio_format_string af_string;

assert(dc->state == DECODE_STATE_START);

assert(dc->pipe != NULL);

assert(decoder != NULL);

assert(decoder->stream_tag == NULL);

assert(decoder->decoder_tag == NULL);

assert(audio_format_defined(audio_format));

assert(audio_format_valid(audio_format));

dc.in_audio_format = *audio_format;

getOutputAudioFormat(audio_format, &dc.out_audio_format);

dc.seekable = seekable;

dc.total_time = total_time;

dc.state = DECODE_STATE_DECODE;

notify_signal(&pc.notify);

g_debug("audio_format=%u:%u:%u, seekable=%s",

dc.in_audio_format.sample_rate, dc.in_audio_format.bits,

dc.in_audio_format.channels,

dc->in_audio_format = *audio_format;

getOutputAudioFormat(audio_format, &dc->out_audio_format);

dc->seekable = seekable;

dc->total_time = total_time;

decoder_lock(dc);

dc->state = DECODE_STATE_DECODE;

decoder_unlock(dc);

player_lock_signal();

g_debug("audio_format=%s, seekable=%s",

audio_format_to_string(&dc->in_audio_format, &af_string),

seekable ? "true" : "false");

if (!audio_format_equals(&dc.in_audio_format, &dc.out_audio_format))

g_debug("converting to %u:%u:%u",

dc.out_audio_format.sample_rate,

dc.out_audio_format.bits,

dc.out_audio_format.channels);

}

char *decoder_get_uri(G_GNUC_UNUSED struct decoder *decoder)

{

assert(dc.pipe != NULL);

return song_get_uri(dc.current_song);

if (!audio_format_equals(&dc->in_audio_format,

&dc->out_audio_format))

g_debug("converting to %s",

audio_format_to_string(&dc->out_audio_format,

&af_string));

}

enum decoder_command decoder_get_command(G_GNUC_UNUSED struct decoder * decoder)

{

assert(dc.pipe != NULL);

return dc.command;

const struct decoder_control *dc = decoder->dc;

assert(dc->pipe != NULL);

return dc->command;

}

void decoder_command_finished(G_GNUC_UNUSED struct decoder * decoder)

void

decoder_command_finished(struct decoder *decoder)

{

assert(dc.command != DECODE_COMMAND_NONE);

assert(dc.command != DECODE_COMMAND_SEEK ||

dc.seek_error || decoder->seeking);

assert(dc.pipe != NULL);

struct decoder_control *dc = decoder->dc;

decoder_lock(dc);

assert(dc->command != DECODE_COMMAND_NONE);

assert(dc->command != DECODE_COMMAND_SEEK ||

dc->seek_error || decoder->seeking);

100

assert(dc->pipe != NULL);

101

102

if (decoder->seeking) {

103

decoder->seeking = false;

105

/* delete frames from the old song position */

100

106

101

107

if (decoder->chunk != NULL) {

102

music_buffer_return(dc.buffer, decoder->chunk);

108

music_buffer_return(dc->buffer, decoder->chunk);

103

109

decoder->chunk = NULL;

104

110

}

105

111

106

music_pipe_clear(dc.pipe, dc.buffer);

112

music_pipe_clear(dc->pipe, dc->buffer);

113

114

decoder->timestamp = dc->seek_where;

107

115

}

108

116

109

dc.command = DECODE_COMMAND_NONE;

110

notify_signal(&pc.notify);

117

dc->command = DECODE_COMMAND_NONE;

118

decoder_unlock(dc);

119

120

player_lock_signal();

111

121

}

112

122

113

123

double decoder_seek_where(G_GNUC_UNUSED struct decoder * decoder)

114

124

{

115

assert(dc.command == DECODE_COMMAND_SEEK);

116

assert(dc.pipe != NULL);

125

const struct decoder_control *dc = decoder->dc;

126

127

assert(dc->command == DECODE_COMMAND_SEEK);

128

assert(dc->pipe != NULL);

117

129

118

130

decoder->seeking = true;

119

131

120

return dc.seek_where;

132

return dc->seek_where;

121

133

}

122

134

123

135

void decoder_seek_error(struct decoder * decoder)

124

136

{

125

assert(dc.command == DECODE_COMMAND_SEEK);

126

assert(dc.pipe != NULL);

127

128

dc.seek_error = true;

137

struct decoder_control *dc = decoder->dc;

138

139

assert(dc->command == DECODE_COMMAND_SEEK);

140

assert(dc->pipe != NULL);

141

142

dc->seek_error = true;

129

143

decoder->seeking = false;

130

144

131

145

decoder_command_finished(decoder);

135

149

struct input_stream *is,

136

150

void *buffer, size_t length)

137

151

{

152

const struct decoder_control *dc =

153

decoder != NULL ? decoder->dc : NULL;

154

GError *error = NULL;

138

155

size_t nbytes;

139

156

140

157

assert(decoder == NULL ||

141

dc.state == DECODE_STATE_START ||

142

dc.state == DECODE_STATE_DECODE);

158

dc->state == DECODE_STATE_START ||

159

dc->state == DECODE_STATE_DECODE);

143

160

assert(is != NULL);

144

161

assert(buffer != NULL);

145

162

152

169

/* ignore the SEEK command during initialization,

153

170

the plugin should handle that after it has

154

171

initialized successfully */

155

(dc.command != DECODE_COMMAND_SEEK ||

156

(dc.state != DECODE_STATE_START && !decoder->seeking)) &&

157

dc.command != DECODE_COMMAND_NONE)

158

return 0;

159

160

nbytes = input_stream_read(is, buffer, length);

172

(dc->command != DECODE_COMMAND_SEEK ||

173

(dc->state != DECODE_STATE_START && !decoder->seeking)) &&

174

dc->command != DECODE_COMMAND_NONE)

175

return 0;

176

177

nbytes = input_stream_read(is, buffer, length, &error);

178

179

if (G_UNLIKELY(nbytes == 0 && error != NULL)) {

180

g_warning("%s", error->message);

181

g_error_free(error);

182

return 0;

183

}

184

161

185

if (nbytes > 0 || input_stream_eof(is))

162

186

return nbytes;

163

187

167

191

}

168

192

}

169

193

194

void

195

decoder_timestamp(struct decoder *decoder, double t)

196

{

197

assert(decoder != NULL);

198

assert(t >= 0);

199

200

decoder->timestamp = t;

201

}

202

170

203

/**

171

204

* Sends a #tag as-is to the music pipe. Flushes the current chunk

172

205

* (decoder.chunk) if there is one.

181

214

/* there is a partial chunk - flush it, we want the

182

215

tag in a new chunk */

183

216

decoder_flush_chunk(decoder);

184

notify_signal(&pc.notify);

217

player_lock_signal();

185

218

}

186

219

187

220

assert(decoder->chunk == NULL);

188

221

189

222

chunk = decoder_get_chunk(decoder, is);

190

223

if (chunk == NULL) {

191

assert(dc.command != DECODE_COMMAND_NONE);

192

return dc.command;

224

assert(decoder->dc->command != DECODE_COMMAND_NONE);

225

return decoder->dc->command;

193

226

}

194

227

195

228

chunk->tag = tag_dup(tag);

225

258

decoder_data(struct decoder *decoder,

226

259

struct input_stream *is,

227

260

const void *_data, size_t length,

228

float data_time, uint16_t bitRate,

229

struct replay_gain_info *replay_gain_info)

261

uint16_t kbit_rate)

230

262

{

263

struct decoder_control *dc = decoder->dc;

231

264

const char *data = _data;

232

233

assert(dc.state == DECODE_STATE_DECODE);

234

assert(dc.pipe != NULL);

235

assert(length % audio_format_frame_size(&dc.in_audio_format) == 0);

236

237

if (dc.command == DECODE_COMMAND_STOP ||

238

dc.command == DECODE_COMMAND_SEEK ||

265

GError *error = NULL;

266

enum decoder_command cmd;

267

268

assert(dc->state == DECODE_STATE_DECODE);

269

assert(dc->pipe != NULL);

270

assert(length % audio_format_frame_size(&dc->in_audio_format) == 0);

271

272

decoder_lock(dc);

273

cmd = dc->command;

274

decoder_unlock(dc);

275

276

if (cmd == DECODE_COMMAND_STOP || cmd == DECODE_COMMAND_SEEK ||

239

277

length == 0)

240

return dc.command;

278

return cmd;

241

279

242

280

/* send stream tags */

243

281

244

282

if (update_stream_tag(decoder, is)) {

245

enum decoder_command cmd;

246

247

283

if (decoder->decoder_tag != NULL) {

248

284

/* merge with tag from decoder plugin */

249

285

struct tag *tag;

250

286

251

tag = tag_merge(decoder->stream_tag,

252

decoder->decoder_tag);

287

tag = tag_merge(decoder->decoder_tag,

288

decoder->stream_tag);

253

289

cmd = do_send_tag(decoder, is, tag);

254

290

tag_free(tag);

255

291

} else

260

296

return cmd;

261

297

}

262

298

263

if (!audio_format_equals(&dc.in_audio_format, &dc.out_audio_format)) {

299

if (!audio_format_equals(&dc->in_audio_format, &dc->out_audio_format)) {

264

300

data = pcm_convert(&decoder->conv_state,

265

&dc.in_audio_format, data, length,

266

&dc.out_audio_format, &length);

267

268

/* under certain circumstances, pcm_convert() may

269

return an empty buffer - this condition should be

270

investigated further, but for now, do this check as

271

a workaround: */

272

if (data == NULL)

273

return DECODE_COMMAND_NONE;

301

&dc->in_audio_format, data, length,

302

&dc->out_audio_format, &length,

303

&error);

304

if (data == NULL) {

305

/* the PCM conversion has failed - stop

306

playback, since we have no better way to

307

bail out */

308

g_warning("%s", error->message);

309

return DECODE_COMMAND_STOP;

310

}

274

311

}

275

312

276

313

while (length > 0) {

281

318

282

319

chunk = decoder_get_chunk(decoder, is);

283

320

if (chunk == NULL) {

284

assert(dc.command != DECODE_COMMAND_NONE);

285

return dc.command;

321

assert(dc->command != DECODE_COMMAND_NONE);

322

return dc->command;

286

323

}

287

324

288

dest = music_chunk_write(chunk, &dc.out_audio_format,

289

data_time, bitRate, &nbytes);

325

dest = music_chunk_write(chunk, &dc->out_audio_format,

326

decoder->timestamp -

327

dc->song->start_ms / 1000.0,

328

kbit_rate, &nbytes);

290

329

if (dest == NULL) {

291

330

/* the chunk is full, flush it */

292

331

decoder_flush_chunk(decoder);

293

notify_signal(&pc.notify);

332

player_lock_signal();

294

333

continue;

295

334

}

296

335

303

342

304

343

memcpy(dest, data, nbytes);

305

344

306

/* apply replay gain or normalization */

307

308

if (replay_gain_info != NULL &&

309

replay_gain_mode != REPLAY_GAIN_OFF)

310

replay_gain_apply(replay_gain_info, dest, nbytes,

311

&dc.out_audio_format);

312

else if (normalizationEnabled)

313

normalizeData(dest, nbytes, &dc.out_audio_format);

314

315

345

/* expand the music pipe chunk */

316

346

317

full = music_chunk_expand(chunk, &dc.out_audio_format, nbytes);

347

full = music_chunk_expand(chunk, &dc->out_audio_format, nbytes);

318

348

if (full) {

319

349

/* the chunk is full, flush it */

320

350

decoder_flush_chunk(decoder);

321

notify_signal(&pc.notify);

351

player_lock_signal();

322

352

}

323

353

324

354

data += nbytes;

325

355

length -= nbytes;

356

357

decoder->timestamp += (double)nbytes /

358

audio_format_time_to_size(&dc->out_audio_format);

359

360

if (dc->song->end_ms > 0 &&

361

decoder->timestamp >= dc->song->end_ms / 1000.0)

362

/* the end of this range has been reached:

363

stop decoding */

364

return DECODE_COMMAND_STOP;

326

365

}

327

366

328

367

return DECODE_COMMAND_NONE;

332

371

decoder_tag(G_GNUC_UNUSED struct decoder *decoder, struct input_stream *is,

333

372

const struct tag *tag)

334

373

{

374

G_GNUC_UNUSED const struct decoder_control *dc = decoder->dc;

335

375

enum decoder_command cmd;

336

376

337

assert(dc.state == DECODE_STATE_DECODE);

338

assert(dc.pipe != NULL);

377

assert(dc->state == DECODE_STATE_DECODE);

378

assert(dc->pipe != NULL);

339

379

assert(tag != NULL);

340

380

341

381

/* save the tag */

363

403

364

404

return cmd;

365

405

}

406

407

float

408

decoder_replay_gain(struct decoder *decoder,

409

const struct replay_gain_info *replay_gain_info)

410

{

411

float return_db = 0;

412

assert(decoder != NULL);

413

414

if (replay_gain_info != NULL) {

415

static unsigned serial;

416

if (++serial == 0)

417

serial = 1;

418

419

if (REPLAY_GAIN_OFF != replay_gain_mode) {

420

return_db = 20.0 * log10f(

421

replay_gain_tuple_scale(

422

&replay_gain_info->tuples[replay_gain_get_real_mode()],

423

replay_gain_preamp, replay_gain_missing_preamp,

424

replay_gain_limit));

425

}

426

427

decoder->replay_gain_info = *replay_gain_info;

428

decoder->replay_gain_serial = serial;

429

430

if (decoder->chunk != NULL) {

431

/* flush the current chunk because the new

432

replay gain values affect the following

433

samples */

434

decoder_flush_chunk(decoder);

435

player_lock_signal();

436

}

437

} else

438

decoder->replay_gain_serial = 0;

439

440

return return_db;

441

}

442

443

void

444

decoder_mixramp(struct decoder *decoder, float replay_gain_db,

445

char *mixramp_start, char *mixramp_end)

446

{

447

assert(decoder != NULL);

448

struct decoder_control *dc = decoder->dc;

449

assert(dc != NULL);

450

451

dc->replay_gain_db = replay_gain_db;

452

dc_mixramp_start(dc, mixramp_start);

453

dc_mixramp_end(dc, mixramp_end);

454

}

Older »