oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/mad: convert to C++

This commit is contained in:
Max Kellermann 2013-07-26 11:59:17 +02:00
parent ef48eca9ca
commit c8054e569a
4 changed files with 325 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -499,7 +499,9 @@ DECODER_LIBS = \
DECODER_SRC = DECODER_SRC =
if HAVE_MAD if HAVE_MAD
libdecoder_plugins_a_SOURCES += src/decoder/mad_decoder_plugin.c libdecoder_plugins_a_SOURCES += \
src/decoder/MadDecoderPlugin.cxx \
src/decoder/MadDecoderPlugin.hxx
endif endif
if HAVE_MPG123 if HAVE_MPG123

2
src/DecoderList.cxx
View File

@ -33,12 +33,12 @@
#include "decoder/FfmpegDecoderPlugin.hxx" #include "decoder/FfmpegDecoderPlugin.hxx"
#include "decoder/GmeDecoderPlugin.hxx" #include "decoder/GmeDecoderPlugin.hxx"
#include "decoder/FaadDecoderPlugin.hxx" #include "decoder/FaadDecoderPlugin.hxx"
#include "decoder/MadDecoderPlugin.hxx"
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>
extern const struct decoder_plugin mad_decoder_plugin;
extern const struct decoder_plugin mpg123_decoder_plugin; extern const struct decoder_plugin mpg123_decoder_plugin;
extern const struct decoder_plugin sndfile_decoder_plugin; extern const struct decoder_plugin sndfile_decoder_plugin;
extern const struct decoder_plugin audiofile_decoder_plugin; extern const struct decoder_plugin audiofile_decoder_plugin;

610
src/decoder/mad_decoder_plugin.c → src/decoder/MadDecoderPlugin.cxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -18,10 +18,15 @@
*/ */
#include "config.h" #include "config.h"
#include "MadDecoderPlugin.hxx"
#include "decoder_api.h" #include "decoder_api.h"
#include "conf.h" #include "conf.h"
extern "C" {
#include "tag_id3.h" #include "tag_id3.h"
#include "tag_rva2.h" #include "tag_rva2.h"
}
#include "tag_handler.h" #include "tag_handler.h"
#include "audio_check.h" #include "audio_check.h"
@ -108,7 +113,7 @@ mp3_plugin_init(G_GNUC_UNUSED const struct config_param *param)
#define MP3_DATA_OUTPUT_BUFFER_SIZE 2048 #define MP3_DATA_OUTPUT_BUFFER_SIZE 2048
struct mp3_data { struct MadDecoder {
struct mad_stream stream; struct mad_stream stream;
struct mad_frame frame; struct mad_frame frame;
struct mad_synth synth; struct mad_synth synth;
@ -136,64 +141,96 @@ struct mp3_data {
struct decoder *decoder; struct decoder *decoder;
struct input_stream *input_stream; struct input_stream *input_stream;
enum mad_layer layer; enum mad_layer layer;
MadDecoder(struct decoder *decoder, struct input_stream *input_stream);
~MadDecoder();
bool Seek(long offset);
bool FillBuffer();
void ParseId3(size_t tagsize, struct tag **mpd_tag);
enum mp3_action DecodeNextFrameHeader(struct tag **tag);
enum mp3_action DecodeNextFrame();
gcc_pure
goffset ThisFrameOffset() const;
gcc_pure
goffset RestIncludingThisFrame() const;
/**
* Attempt to calulcate the length of the song from filesize
*/
void FileSizeToSongLength();
bool DecodeFirstFrame(struct tag **tag);
gcc_pure
long TimeToFrame(double t) const;
void UpdateTimerNextFrame();
/**
* Sends the synthesized current frame via decoder_data().
*/
enum decoder_command SendPCM(unsigned i, unsigned pcm_length);
/**
* Synthesize the current frame and send it via
* decoder_data().
*/
enum decoder_command SyncAndSend();
bool Read();
}; };
static void MadDecoder::MadDecoder(struct decoder *_decoder,
mp3_data_init(struct mp3_data *data, struct decoder *decoder, struct input_stream *_input_stream)
struct input_stream *input_stream) :mute_frame(MUTEFRAME_NONE),
frame_offsets(nullptr),
times(nullptr),
highest_frame(0), max_frames(0), current_frame(0),
drop_start_frames(0), drop_end_frames(0),
drop_start_samples(0), drop_end_samples(0),
found_replay_gain(false), found_xing(false),
found_first_frame(false), decoded_first_frame(false),
decoder(_decoder), input_stream(_input_stream),
layer(mad_layer(0))
{ {
data->mute_frame = MUTEFRAME_NONE; mad_stream_init(&stream);
data->highest_frame = 0; mad_stream_options(&stream, MAD_OPTION_IGNORECRC);
data->max_frames = 0; mad_frame_init(&frame);
data->frame_offsets = NULL; mad_synth_init(&synth);
data->times = NULL; mad_timer_reset(&timer);
data->current_frame = 0;
data->drop_start_frames = 0;
data->drop_end_frames = 0;
data->drop_start_samples = 0;
data->drop_end_samples = 0;
data->found_replay_gain = false;
data->found_xing = false;
data->found_first_frame = false;
data->decoded_first_frame = false;
data->decoder = decoder;
data->input_stream = input_stream;
data->layer = 0;
mad_stream_init(&data->stream);
mad_stream_options(&data->stream, MAD_OPTION_IGNORECRC);
mad_frame_init(&data->frame);
mad_synth_init(&data->synth);
mad_timer_reset(&data->timer);
} }
static bool mp3_seek(struct mp3_data *data, long offset) inline bool
MadDecoder::Seek(long offset)
{ {
if (!input_stream_lock_seek(data->input_stream, offset, SEEK_SET, NULL)) if (!input_stream_lock_seek(input_stream, offset, SEEK_SET,
nullptr))
return false; return false;
mad_stream_buffer(&data->stream, data->input_buffer, 0); mad_stream_buffer(&stream, input_buffer, 0);
(data->stream).error = 0; stream.error = MAD_ERROR_NONE;
return true; return true;
} }
static bool inline bool
mp3_fill_buffer(struct mp3_data *data) MadDecoder::FillBuffer()
{ {
size_t remaining, length; size_t remaining, length;
unsigned char *dest; unsigned char *dest;
if (data->stream.next_frame != NULL) { if (stream.next_frame != nullptr) {
remaining = data->stream.bufend - data->stream.next_frame; remaining = stream.bufend - stream.next_frame;
memmove(data->input_buffer, data->stream.next_frame, memmove(input_buffer, stream.next_frame, remaining);
remaining); dest = input_buffer + remaining;
dest = (data->input_buffer) + remaining;
length = READ_BUFFER_SIZE - remaining; length = READ_BUFFER_SIZE - remaining;
} else { } else {
remaining = 0; remaining = 0;
length = READ_BUFFER_SIZE; length = READ_BUFFER_SIZE;
dest = data->input_buffer; dest = input_buffer;
} }
/* we've exhausted the read buffer, so give up!, these potential /* we've exhausted the read buffer, so give up!, these potential
@ -201,13 +238,12 @@ mp3_fill_buffer(struct mp3_data *data)
if (length == 0) if (length == 0)
return false; return false;
length = decoder_read(data->decoder, data->input_stream, dest, length); length = decoder_read(decoder, input_stream, dest, length);
if (length == 0) if (length == 0)
return false; return false;
mad_stream_buffer(&data->stream, data->input_buffer, mad_stream_buffer(&stream, input_buffer, length + remaining);
length + remaining); stream.error = MAD_ERROR_NONE;
(data->stream).error = 0;
return true; return true;
} }
@ -271,8 +307,8 @@ parse_id3_mixramp(char **mixramp_start, char **mixramp_end,
struct id3_frame *frame; struct id3_frame *frame;
bool found = false; bool found = false;
*mixramp_start = NULL; *mixramp_start = nullptr;
*mixramp_end = NULL; *mixramp_end = nullptr;
for (i = 0; (frame = id3_tag_findframe(tag, "TXXX", i)); i++) { for (i = 0; (frame = id3_tag_findframe(tag, "TXXX", i)); i++) {
if (frame->nfields < 3) if (frame->nfields < 3)
@ -301,29 +337,29 @@ parse_id3_mixramp(char **mixramp_start, char **mixramp_end,
} }
#endif #endif
static void mp3_parse_id3(struct mp3_data *data, size_t tagsize, inline void
struct tag **mpd_tag) MadDecoder::ParseId3(size_t tagsize, struct tag **mpd_tag)
{ {
#ifdef HAVE_ID3TAG #ifdef HAVE_ID3TAG
struct id3_tag *id3_tag = NULL; struct id3_tag *id3_tag = nullptr;
id3_length_t count; id3_length_t count;
id3_byte_t const *id3_data; id3_byte_t const *id3_data;
id3_byte_t *allocated = NULL; id3_byte_t *allocated = nullptr;
count = data->stream.bufend - data->stream.this_frame; count = stream.bufend - stream.this_frame;
if (tagsize <= count) { if (tagsize <= count) {
id3_data = data->stream.this_frame; id3_data = stream.this_frame;
mad_stream_skip(&(data->stream), tagsize); mad_stream_skip(&(stream), tagsize);
} else { } else {
allocated = g_malloc(tagsize); allocated = (id3_byte_t *)g_malloc(tagsize);
memcpy(allocated, data->stream.this_frame, count); memcpy(allocated, stream.this_frame, count);
mad_stream_skip(&(data->stream), count); mad_stream_skip(&(stream), count);
while (count < tagsize) { while (count < tagsize) {
size_t len; size_t len;
len = decoder_read(data->decoder, data->input_stream, len = decoder_read(decoder, input_stream,
allocated + count, tagsize - count); allocated + count, tagsize - count);
if (len == 0) if (len == 0)
break; break;
@ -341,33 +377,32 @@ static void mp3_parse_id3(struct mp3_data *data, size_t tagsize,
} }
id3_tag = id3_tag_parse(id3_data, tagsize); id3_tag = id3_tag_parse(id3_data, tagsize);
if (id3_tag == NULL) { if (id3_tag == nullptr) {
g_free(allocated); g_free(allocated);
return; return;
} }
if (mpd_tag) { if (mpd_tag) {
struct tag *tmp_tag = tag_id3_import(id3_tag); struct tag *tmp_tag = tag_id3_import(id3_tag);
if (tmp_tag != NULL) { if (tmp_tag != nullptr) {
if (*mpd_tag != NULL) if (*mpd_tag != nullptr)
tag_free(*mpd_tag); tag_free(*mpd_tag);
*mpd_tag = tmp_tag; *mpd_tag = tmp_tag;
} }
} }
if (data->decoder != NULL) { if (decoder != nullptr) {
struct replay_gain_info rgi; struct replay_gain_info rgi;
char *mixramp_start; char *mixramp_start;
char *mixramp_end; char *mixramp_end;
if (parse_id3_replay_gain_info(&rgi, id3_tag)) { if (parse_id3_replay_gain_info(&rgi, id3_tag)) {
decoder_replay_gain(data->decoder, &rgi); decoder_replay_gain(decoder, &rgi);
data->found_replay_gain = true; found_replay_gain = true;
} }
if (parse_id3_mixramp(&mixramp_start, &mixramp_end, id3_tag)) if (parse_id3_mixramp(&mixramp_start, &mixramp_end, id3_tag))
decoder_mixramp(data->decoder, decoder_mixramp(decoder, mixramp_start, mixramp_end);
mixramp_start, mixramp_end);
} }
id3_tag_delete(id3_tag); id3_tag_delete(id3_tag);
@ -379,12 +414,12 @@ static void mp3_parse_id3(struct mp3_data *data, size_t tagsize,
/* This code is enabled when libid3tag is disabled. Instead /* This code is enabled when libid3tag is disabled. Instead
of parsing the ID3 frame, it just skips it. */ of parsing the ID3 frame, it just skips it. */
size_t count = data->stream.bufend - data->stream.this_frame; size_t count = stream.bufend - stream.this_frame;
if (tagsize <= count) { if (tagsize <= count) {
mad_stream_skip(&data->stream, tagsize); mad_stream_skip(&stream, tagsize);
} else { } else {
mad_stream_skip(&data->stream, count); mad_stream_skip(&stream, count);
while (count < tagsize) { while (count < tagsize) {
size_t len = tagsize - count; size_t len = tagsize - count;
@ -392,7 +427,7 @@ static void mp3_parse_id3(struct mp3_data *data, size_t tagsize,
if (len > sizeof(ignored)) if (len > sizeof(ignored))
len = sizeof(ignored); len = sizeof(ignored);
len = decoder_read(data->decoder, data->input_stream, len = decoder_read(decoder, input_stream,
ignored, len); ignored, len);
if (len == 0) if (len == 0)
break; break;
@ -413,7 +448,7 @@ static void mp3_parse_id3(struct mp3_data *data, size_t tagsize,
static signed long static signed long
id3_tag_query(const void *p0, size_t length) id3_tag_query(const void *p0, size_t length)
{ {
const char *p = p0; const char *p = (const char *)p0;
return length >= 10 && memcmp(p, "ID3", 3) == 0 return length >= 10 && memcmp(p, "ID3", 3) == 0
? (p[8] << 7) + p[9] + 10 ? (p[8] << 7) + p[9] + 10
@ -421,59 +456,51 @@ id3_tag_query(const void *p0, size_t length)
} }
#endif /* !HAVE_ID3TAG */ #endif /* !HAVE_ID3TAG */
static enum mp3_action enum mp3_action
decode_next_frame_header(struct mp3_data *data, G_GNUC_UNUSED struct tag **tag) MadDecoder::DecodeNextFrameHeader(struct tag **tag)
{ {
enum mad_layer layer; if ((stream.buffer == nullptr || stream.error == MAD_ERROR_BUFLEN) &&
!FillBuffer())
return DECODE_BREAK;
if ((data->stream).buffer == NULL if (mad_header_decode(&frame.header, &stream)) {
|| (data->stream).error == MAD_ERROR_BUFLEN) { if (stream.error == MAD_ERROR_LOSTSYNC && stream.this_frame) {
if (!mp3_fill_buffer(data)) signed long tagsize = id3_tag_query(stream.this_frame,
return DECODE_BREAK; stream.bufend -
} stream.this_frame);
if (mad_header_decode(&data->frame.header, &data->stream)) {
if ((data->stream).error == MAD_ERROR_LOSTSYNC &&
(data->stream).this_frame) {
signed long tagsize = id3_tag_query((data->stream).
this_frame,
(data->stream).
bufend -
(data->stream).
this_frame);
if (tagsize > 0) { if (tagsize > 0) {
if (tag && !(*tag)) { if (tag && !(*tag)) {
mp3_parse_id3(data, (size_t)tagsize, ParseId3((size_t)tagsize, tag);
tag);
} else { } else {
mad_stream_skip(&(data->stream), mad_stream_skip(&stream, tagsize);
tagsize);
} }
return DECODE_CONT; return DECODE_CONT;
} }
} }
if (MAD_RECOVERABLE((data->stream).error)) { if (MAD_RECOVERABLE(stream.error)) {
return DECODE_SKIP; return DECODE_SKIP;
} else { } else {
if ((data->stream).error == MAD_ERROR_BUFLEN) if (stream.error == MAD_ERROR_BUFLEN)
return DECODE_CONT; return DECODE_CONT;
else { else {
g_warning("unrecoverable frame level error " g_warning("unrecoverable frame level error "
"(%s).\n", "(%s).\n",
mad_stream_errorstr(&data->stream)); mad_stream_errorstr(&stream));
return DECODE_BREAK; return DECODE_BREAK;
} }
} }
} }
layer = data->frame.header.layer; enum mad_layer new_layer = frame.header.layer;
if (!data->layer) { if (layer == (mad_layer)0) {
if (layer != MAD_LAYER_II && layer != MAD_LAYER_III) { if (new_layer != MAD_LAYER_II && new_layer != MAD_LAYER_III) {
/* Only layer 2 and 3 have been tested to work */ /* Only layer 2 and 3 have been tested to work */
return DECODE_SKIP; return DECODE_SKIP;
} }
data->layer = layer;
} else if (layer != data->layer) { layer = new_layer;
} else if (new_layer != layer) {
/* Don't decode frames with a different layer than the first */ /* Don't decode frames with a different layer than the first */
return DECODE_SKIP; return DECODE_SKIP;
} }
@ -481,36 +508,32 @@ decode_next_frame_header(struct mp3_data *data, G_GNUC_UNUSED struct tag **tag)
return DECODE_OK; return DECODE_OK;
} }
static enum mp3_action enum mp3_action
decodeNextFrame(struct mp3_data *data) MadDecoder::DecodeNextFrame()
{ {
if ((data->stream).buffer == NULL if ((stream.buffer == nullptr || stream.error == MAD_ERROR_BUFLEN) &&
|| (data->stream).error == MAD_ERROR_BUFLEN) { !FillBuffer())
if (!mp3_fill_buffer(data)) return DECODE_BREAK;
return DECODE_BREAK;
} if (mad_frame_decode(&frame, &stream)) {
if (mad_frame_decode(&data->frame, &data->stream)) { if (stream.error == MAD_ERROR_LOSTSYNC) {
if ((data->stream).error == MAD_ERROR_LOSTSYNC) { signed long tagsize = id3_tag_query(stream.this_frame,
signed long tagsize = id3_tag_query((data->stream). stream.bufend -
this_frame, stream.this_frame);
(data->stream).
bufend -
(data->stream).
this_frame);
if (tagsize > 0) { if (tagsize > 0) {
mad_stream_skip(&(data->stream), tagsize); mad_stream_skip(&stream, tagsize);
return DECODE_CONT; return DECODE_CONT;
} }
} }
if (MAD_RECOVERABLE((data->stream).error)) { if (MAD_RECOVERABLE(stream.error)) {
return DECODE_SKIP; return DECODE_SKIP;
} else { } else {
if ((data->stream).error == MAD_ERROR_BUFLEN) if (stream.error == MAD_ERROR_BUFLEN)
return DECODE_CONT; return DECODE_CONT;
else { else {
g_warning("unrecoverable frame level error " g_warning("unrecoverable frame level error "
"(%s).\n", "(%s).\n",
mad_stream_errorstr(&data->stream)); mad_stream_errorstr(&stream));
return DECODE_BREAK; return DECODE_BREAK;
} }
} }
@ -752,48 +775,43 @@ mp3_frame_duration(const struct mad_frame *frame)
MAD_UNITS_MILLISECONDS) / 1000.0; MAD_UNITS_MILLISECONDS) / 1000.0;
} }
static goffset inline goffset
mp3_this_frame_offset(const struct mp3_data *data) MadDecoder::ThisFrameOffset() const
{ {
goffset offset = input_stream_get_offset(data->input_stream); goffset offset = input_stream_get_offset(input_stream);
if (data->stream.this_frame != NULL) if (stream.this_frame != nullptr)
offset -= data->stream.bufend - data->stream.this_frame; offset -= stream.bufend - stream.this_frame;
else else
offset -= data->stream.bufend - data->stream.buffer; offset -= stream.bufend - stream.buffer;
return offset; return offset;
} }
static goffset inline goffset
mp3_rest_including_this_frame(const struct mp3_data *data) MadDecoder::RestIncludingThisFrame() const
{ {
return input_stream_get_size(data->input_stream) return input_stream_get_size(input_stream) - ThisFrameOffset();
- mp3_this_frame_offset(data);
} }
/** inline void
* Attempt to calulcate the length of the song from filesize MadDecoder::FileSizeToSongLength()
*/
static void
mp3_filesize_to_song_length(struct mp3_data *data)
{ {
goffset rest = mp3_rest_including_this_frame(data); goffset rest = RestIncludingThisFrame();
if (rest > 0) { if (rest > 0) {
float frame_duration = mp3_frame_duration(&data->frame); float frame_duration = mp3_frame_duration(&frame);
data->total_time = (rest * 8.0) / (data->frame).header.bitrate; total_time = (rest * 8.0) / frame.header.bitrate;
data->max_frames = data->total_time / frame_duration + max_frames = total_time / frame_duration + FRAMES_CUSHION;
FRAMES_CUSHION;
} else { } else {
data->max_frames = FRAMES_CUSHION; max_frames = FRAMES_CUSHION;
data->total_time = 0; total_time = 0;
} }
} }
static bool inline bool
mp3_decode_first_frame(struct mp3_data *data, struct tag **tag) MadDecoder::DecodeFirstFrame(struct tag **tag)
{ {
struct xing xing; struct xing xing;
struct lame lame; struct lame lame;
@ -807,127 +825,103 @@ mp3_decode_first_frame(struct mp3_data *data, struct tag **tag)
while (true) { while (true) {
do { do {
ret = decode_next_frame_header(data, tag); ret = DecodeNextFrameHeader(tag);
} while (ret == DECODE_CONT); } while (ret == DECODE_CONT);
if (ret == DECODE_BREAK) if (ret == DECODE_BREAK)
return false; return false;
if (ret == DECODE_SKIP) continue; if (ret == DECODE_SKIP) continue;
do { do {
ret = decodeNextFrame(data); ret = DecodeNextFrame();
} while (ret == DECODE_CONT); } while (ret == DECODE_CONT);
if (ret == DECODE_BREAK) if (ret == DECODE_BREAK)
return false; return false;
if (ret == DECODE_OK) break; if (ret == DECODE_OK) break;
} }
ptr = data->stream.anc_ptr; ptr = stream.anc_ptr;
bitlen = data->stream.anc_bitlen; bitlen = stream.anc_bitlen;
mp3_filesize_to_song_length(data); FileSizeToSongLength();
/* /*
* if an xing tag exists, use that! * if an xing tag exists, use that!
*/ */
if (parse_xing(&xing, &ptr, &bitlen)) { if (parse_xing(&xing, &ptr, &bitlen)) {
data->found_xing = true; found_xing = true;
data->mute_frame = MUTEFRAME_SKIP; mute_frame = MUTEFRAME_SKIP;
if ((xing.flags & XING_FRAMES) && xing.frames) { if ((xing.flags & XING_FRAMES) && xing.frames) {
mad_timer_t duration = data->frame.header.duration; mad_timer_t duration = frame.header.duration;
mad_timer_multiply(&duration, xing.frames); mad_timer_multiply(&duration, xing.frames);
data->total_time = ((float)mad_timer_count(duration, MAD_UNITS_MILLISECONDS)) / 1000; total_time = ((float)mad_timer_count(duration, MAD_UNITS_MILLISECONDS)) / 1000;
data->max_frames = xing.frames; max_frames = xing.frames;
} }
if (parse_lame(&lame, &ptr, &bitlen)) { if (parse_lame(&lame, &ptr, &bitlen)) {
if (gapless_playback && if (gapless_playback &&
input_stream_is_seekable(data->input_stream)) { input_stream_is_seekable(input_stream)) {
data->drop_start_samples = lame.encoder_delay + drop_start_samples = lame.encoder_delay +
DECODERDELAY; DECODERDELAY;
data->drop_end_samples = lame.encoder_padding; drop_end_samples = lame.encoder_padding;
} }
/* Album gain isn't currently used. See comment in /* Album gain isn't currently used. See comment in
* parse_lame() for details. -- jat */ * parse_lame() for details. -- jat */
if (data->decoder != NULL && if (decoder != nullptr && !found_replay_gain &&
!data->found_replay_gain &&
lame.track_gain) { lame.track_gain) {
struct replay_gain_info rgi; struct replay_gain_info rgi;
replay_gain_info_init(&rgi); replay_gain_info_init(&rgi);
rgi.tuples[REPLAY_GAIN_TRACK].gain = lame.track_gain; rgi.tuples[REPLAY_GAIN_TRACK].gain = lame.track_gain;
rgi.tuples[REPLAY_GAIN_TRACK].peak = lame.peak; rgi.tuples[REPLAY_GAIN_TRACK].peak = lame.peak;
decoder_replay_gain(data->decoder, &rgi); decoder_replay_gain(decoder, &rgi);
} }
} }
} }
if (!data->max_frames) if (!max_frames)
return false; return false;
if (data->max_frames > 8 * 1024 * 1024) { if (max_frames > 8 * 1024 * 1024) {
g_warning("mp3 file header indicates too many frames: %lu\n", g_warning("mp3 file header indicates too many frames: %lu\n",
data->max_frames); max_frames);
return false; return false;
} }
data->frame_offsets = g_malloc(sizeof(long) * data->max_frames); frame_offsets = new long[max_frames];
data->times = g_malloc(sizeof(mad_timer_t) * data->max_frames); times = new mad_timer_t[max_frames];
return true; return true;
} }
static void mp3_data_finish(struct mp3_data *data) MadDecoder::~MadDecoder()
{ {
mad_synth_finish(&data->synth); mad_synth_finish(&synth);
mad_frame_finish(&data->frame); mad_frame_finish(&frame);
mad_stream_finish(&data->stream); mad_stream_finish(&stream);
g_free(data->frame_offsets); delete[] frame_offsets;
g_free(data->times); delete[] times;
} }
/* this is primarily used for getting total time for tags */ /* this is primarily used for getting total time for tags */
static int static int
mad_decoder_total_file_time(struct input_stream *is) mad_decoder_total_file_time(struct input_stream *is)
{ {
struct mp3_data data; MadDecoder data(nullptr, is);
int ret; return data.DecodeFirstFrame(nullptr)
? data.total_time + 0.5
mp3_data_init(&data, NULL, is); : -1;
if (!mp3_decode_first_frame(&data, NULL))
ret = -1;
else
ret = data.total_time + 0.5;
mp3_data_finish(&data);
return ret;
} }
static bool long
mp3_open(struct input_stream *is, struct mp3_data *data, MadDecoder::TimeToFrame(double t) const
struct decoder *decoder, struct tag **tag)
{
mp3_data_init(data, decoder, is);
*tag = NULL;
if (!mp3_decode_first_frame(data, tag)) {
mp3_data_finish(data);
if (tag && *tag)
tag_free(*tag);
return false;
}
return true;
}
static long
mp3_time_to_frame(const struct mp3_data *data, double t)
{ {
unsigned long i; unsigned long i;
for (i = 0; i < data->highest_frame; ++i) { for (i = 0; i < highest_frame; ++i) {
double frame_time = double frame_time =
mad_timer_count(data->times[i], mad_timer_count(times[i],
MAD_UNITS_MILLISECONDS) / 1000.; MAD_UNITS_MILLISECONDS) / 1000.;
if (frame_time >= t) if (frame_time >= t)
break; break;
@ -936,46 +930,40 @@ mp3_time_to_frame(const struct mp3_data *data, double t)
return i; return i;
} }
static void void
mp3_update_timer_next_frame(struct mp3_data *data) MadDecoder::UpdateTimerNextFrame()
{ {
if (data->current_frame >= data->highest_frame) { if (current_frame >= highest_frame) {
/* record this frame's properties in /* record this frame's properties in frame_offsets
data->frame_offsets (for seeking) and (for seeking) and times */
data->times */ bit_rate = frame.header.bitrate;
data->bit_rate = (data->frame).header.bitrate;
if (data->current_frame >= data->max_frames) if (current_frame >= max_frames)
/* cap data->current_frame */ /* cap current_frame */
data->current_frame = data->max_frames - 1; current_frame = max_frames - 1;
else else
data->highest_frame++; highest_frame++;
data->frame_offsets[data->current_frame] = frame_offsets[current_frame] = ThisFrameOffset();
mp3_this_frame_offset(data);
mad_timer_add(&data->timer, (data->frame).header.duration); mad_timer_add(&timer, frame.header.duration);
data->times[data->current_frame] = data->timer; times[current_frame] = timer;
} else } else
/* get the new timer value from data->times */ /* get the new timer value from "times" */
data->timer = data->times[data->current_frame]; timer = times[current_frame];
data->current_frame++; current_frame++;
data->elapsed_time = elapsed_time = mad_timer_count(timer, MAD_UNITS_MILLISECONDS) / 1000.0;
mad_timer_count(data->timer, MAD_UNITS_MILLISECONDS) / 1000.0;
} }
/** enum decoder_command
* Sends the synthesized current frame via decoder_data(). MadDecoder::SendPCM(unsigned i, unsigned pcm_length)
*/
static enum decoder_command
mp3_send_pcm(struct mp3_data *data, unsigned i, unsigned pcm_length)
{ {
unsigned max_samples; unsigned max_samples;
max_samples = sizeof(data->output_buffer) / max_samples = sizeof(output_buffer) /
sizeof(data->output_buffer[0]) / sizeof(output_buffer[0]) /
MAD_NCHANNELS(&(data->frame).header); MAD_NCHANNELS(&frame.header);
while (i < pcm_length) { while (i < pcm_length) {
enum decoder_command cmd; enum decoder_command cmd;
@ -985,16 +973,14 @@ mp3_send_pcm(struct mp3_data *data, unsigned i, unsigned pcm_length)
i += num_samples; i += num_samples;
mad_fixed_to_24_buffer(data->output_buffer, mad_fixed_to_24_buffer(output_buffer, &synth,
&data->synth,
i - num_samples, i, i - num_samples, i,
MAD_NCHANNELS(&(data->frame).header)); MAD_NCHANNELS(&frame.header));
num_samples *= MAD_NCHANNELS(&(data->frame).header); num_samples *= MAD_NCHANNELS(&frame.header);
cmd = decoder_data(data->decoder, data->input_stream, cmd = decoder_data(decoder, input_stream, output_buffer,
data->output_buffer, sizeof(output_buffer[0]) * num_samples,
sizeof(data->output_buffer[0]) * num_samples, bit_rate / 1000);
data->bit_rate / 1000);
if (cmd != DECODE_COMMAND_NONE) if (cmd != DECODE_COMMAND_NONE)
return cmd; return cmd;
} }
@ -1002,57 +988,51 @@ mp3_send_pcm(struct mp3_data *data, unsigned i, unsigned pcm_length)
return DECODE_COMMAND_NONE; return DECODE_COMMAND_NONE;
} }
/** inline enum decoder_command
* Synthesize the current frame and send it via decoder_data(). MadDecoder::SyncAndSend()
*/
static enum decoder_command
mp3_synth_and_send(struct mp3_data *data)
{ {
unsigned i, pcm_length; mad_synth_frame(&synth, &frame);
enum decoder_command cmd;
mad_synth_frame(&data->synth, &data->frame); if (!found_first_frame) {
unsigned int samples_per_frame = synth.pcm.length;
if (!data->found_first_frame) { drop_start_frames = drop_start_samples / samples_per_frame;
unsigned int samples_per_frame = data->synth.pcm.length; drop_end_frames = drop_end_samples / samples_per_frame;
data->drop_start_frames = data->drop_start_samples / samples_per_frame; drop_start_samples = drop_start_samples % samples_per_frame;
data->drop_end_frames = data->drop_end_samples / samples_per_frame; drop_end_samples = drop_end_samples % samples_per_frame;
data->drop_start_samples = data->drop_start_samples % samples_per_frame; found_first_frame = true;
data->drop_end_samples = data->drop_end_samples % samples_per_frame;
data->found_first_frame = true;
} }
if (data->drop_start_frames > 0) { if (drop_start_frames > 0) {
data->drop_start_frames--; drop_start_frames--;
return DECODE_COMMAND_NONE; return DECODE_COMMAND_NONE;
} else if ((data->drop_end_frames > 0) && } else if ((drop_end_frames > 0) &&
(data->current_frame == (data->max_frames + 1 - data->drop_end_frames))) { (current_frame == (max_frames + 1 - drop_end_frames))) {
/* stop decoding, effectively dropping all remaining /* stop decoding, effectively dropping all remaining
frames */ frames */
return DECODE_COMMAND_STOP; return DECODE_COMMAND_STOP;
} }
if (!data->decoded_first_frame) { unsigned i = 0;
i = data->drop_start_samples; if (!decoded_first_frame) {
data->decoded_first_frame = true; i = drop_start_samples;
} else decoded_first_frame = true;
i = 0;
pcm_length = data->synth.pcm.length;
if (data->drop_end_samples &&
(data->current_frame == data->max_frames - data->drop_end_frames)) {
if (data->drop_end_samples >= pcm_length)
pcm_length = 0;
else
pcm_length -= data->drop_end_samples;
} }
cmd = mp3_send_pcm(data, i, pcm_length); unsigned pcm_length = synth.pcm.length;
if (drop_end_samples &&
(current_frame == max_frames - drop_end_frames)) {
if (drop_end_samples >= pcm_length)
pcm_length = 0;
else
pcm_length -= drop_end_samples;
}
enum decoder_command cmd = SendPCM(i, pcm_length);
if (cmd != DECODE_COMMAND_NONE) if (cmd != DECODE_COMMAND_NONE)
return cmd; return cmd;
if (data->drop_end_samples && if (drop_end_samples &&
(data->current_frame == data->max_frames - data->drop_end_frames)) (current_frame == max_frames - drop_end_frames))
/* stop decoding, effectively dropping /* stop decoding, effectively dropping
* all remaining samples */ * all remaining samples */
return DECODE_COMMAND_STOP; return DECODE_COMMAND_STOP;
@ -1060,41 +1040,39 @@ mp3_synth_and_send(struct mp3_data *data)
return DECODE_COMMAND_NONE; return DECODE_COMMAND_NONE;
} }
static bool inline bool
mp3_read(struct mp3_data *data) MadDecoder::Read()
{ {
struct decoder *decoder = data->decoder;
enum mp3_action ret; enum mp3_action ret;
enum decoder_command cmd; enum decoder_command cmd;
mp3_update_timer_next_frame(data); UpdateTimerNextFrame();
switch (data->mute_frame) { switch (mute_frame) {
case MUTEFRAME_SKIP: case MUTEFRAME_SKIP:
data->mute_frame = MUTEFRAME_NONE; mute_frame = MUTEFRAME_NONE;
break; break;
case MUTEFRAME_SEEK: case MUTEFRAME_SEEK:
if (data->elapsed_time >= data->seek_where) if (elapsed_time >= seek_where)
data->mute_frame = MUTEFRAME_NONE; mute_frame = MUTEFRAME_NONE;
break; break;
case MUTEFRAME_NONE: case MUTEFRAME_NONE:
cmd = mp3_synth_and_send(data); cmd = SyncAndSend();
if (cmd == DECODE_COMMAND_SEEK) { if (cmd == DECODE_COMMAND_SEEK) {
unsigned long j; unsigned long j;
assert(input_stream_is_seekable(data->input_stream)); assert(input_stream_is_seekable(input_stream));
j = mp3_time_to_frame(data, j = TimeToFrame(decoder_seek_where(decoder));
decoder_seek_where(decoder)); if (j < highest_frame) {
if (j < data->highest_frame) { if (Seek(frame_offsets[j])) {
if (mp3_seek(data, data->frame_offsets[j])) { current_frame = j;
data->current_frame = j;
decoder_command_finished(decoder); decoder_command_finished(decoder);
} else } else
decoder_seek_error(decoder); decoder_seek_error(decoder);
} else { } else {
data->seek_where = decoder_seek_where(decoder); seek_where = decoder_seek_where(decoder);
data->mute_frame = MUTEFRAME_SEEK; mute_frame = MUTEFRAME_SEEK;
decoder_command_finished(decoder); decoder_command_finished(decoder);
} }
} else if (cmd != DECODE_COMMAND_NONE) } else if (cmd != DECODE_COMMAND_NONE)
@ -1105,12 +1083,12 @@ mp3_read(struct mp3_data *data)
bool skip = false; bool skip = false;
do { do {
struct tag *tag = NULL; struct tag *tag = nullptr;
ret = decode_next_frame_header(data, &tag); ret = DecodeNextFrameHeader(&tag);
if (tag != NULL) { if (tag != nullptr) {
decoder_tag(decoder, data->input_stream, tag); decoder_tag(decoder, input_stream, tag);
tag_free(tag); tag_free(tag);
} }
} while (ret == DECODE_CONT); } while (ret == DECODE_CONT);
@ -1119,9 +1097,9 @@ mp3_read(struct mp3_data *data)
else if (ret == DECODE_SKIP) else if (ret == DECODE_SKIP)
skip = true; skip = true;
if (data->mute_frame == MUTEFRAME_NONE) { if (mute_frame == MUTEFRAME_NONE) {
do { do {
ret = decodeNextFrame(data); ret = DecodeNextFrame();
} while (ret == DECODE_CONT); } while (ret == DECODE_CONT);
if (ret == DECODE_BREAK) if (ret == DECODE_BREAK)
return false; return false;
@ -1137,18 +1115,21 @@ mp3_read(struct mp3_data *data)
static void static void
mp3_decode(struct decoder *decoder, struct input_stream *input_stream) mp3_decode(struct decoder *decoder, struct input_stream *input_stream)
{ {
struct mp3_data data; MadDecoder data(decoder, input_stream);
GError *error = NULL;
struct tag *tag = NULL; struct tag *tag = nullptr;
struct audio_format audio_format; if (!data.DecodeFirstFrame(&tag)) {
if (tag != nullptr)
tag_free(tag);
if (!mp3_open(input_stream, &data, decoder, &tag)) {
if (decoder_get_command(decoder) == DECODE_COMMAND_NONE) if (decoder_get_command(decoder) == DECODE_COMMAND_NONE)
g_warning g_warning
("Input does not appear to be a mp3 bit stream.\n"); ("Input does not appear to be a mp3 bit stream.\n");
return; return;
} }
struct audio_format audio_format;
GError *error = nullptr;
if (!audio_format_init_checked(&audio_format, if (!audio_format_init_checked(&audio_format,
data.frame.header.samplerate, data.frame.header.samplerate,
SAMPLE_FORMAT_S24_P32, SAMPLE_FORMAT_S24_P32,
@ -1157,9 +1138,8 @@ mp3_decode(struct decoder *decoder, struct input_stream *input_stream)
g_warning("%s", error->message); g_warning("%s", error->message);
g_error_free(error); g_error_free(error);
if (tag != NULL) if (tag != nullptr)
tag_free(tag); tag_free(tag);
mp3_data_finish(&data);
return; return;
} }
@ -1167,14 +1147,12 @@ mp3_decode(struct decoder *decoder, struct input_stream *input_stream)
input_stream_is_seekable(input_stream), input_stream_is_seekable(input_stream),
data.total_time); data.total_time);
if (tag != NULL) { if (tag != nullptr) {
decoder_tag(decoder, input_stream, tag); decoder_tag(decoder, input_stream, tag);
tag_free(tag); tag_free(tag);
} }
while (mp3_read(&data)) ; while (data.Read()) {}
mp3_data_finish(&data);
} }
static bool static bool
@ -1191,14 +1169,18 @@ mad_decoder_scan_stream(struct input_stream *is,
return true; return true;
} }
static const char *const mp3_suffixes[] = { "mp3", "mp2", NULL }; static const char *const mp3_suffixes[] = { "mp3", "mp2", nullptr };
static const char *const mp3_mime_types[] = { "audio/mpeg", NULL }; static const char *const mp3_mime_types[] = { "audio/mpeg", nullptr };
const struct decoder_plugin mad_decoder_plugin = { const struct decoder_plugin mad_decoder_plugin = {
.name = "mad", "mad",
.init = mp3_plugin_init, mp3_plugin_init,
.stream_decode = mp3_decode, nullptr,
.scan_stream = mad_decoder_scan_stream, mp3_decode,
.suffixes = mp3_suffixes, nullptr,
.mime_types = mp3_mime_types nullptr,
mad_decoder_scan_stream,
nullptr,
mp3_suffixes,
mp3_mime_types,
}; };

25
src/decoder/MadDecoderPlugin.hxx Normal file
View File

@ -0,0 +1,25 @@
/*
* Copyright (C) 2003-2013 The Music Player Daemon Project
* 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.
*/
#ifndef MPD_DECODER_MAD_HXX
#define MPD_DECODER_MAD_HXX
extern const struct decoder_plugin mad_decoder_plugin;
#endif