From 3a6619d62c19770211757916c55fa9436385ae20 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 22 Feb 2009 17:17:26 +0100 Subject: encoder: added vorbis encoder This new vorbis encoder plugin is based on the existing shout_ogg.c plugin. --- src/Makefile.am | 4 + src/encoder/vorbis_encoder.c | 388 +++++++++++++++++++++++++++++++++++++++++++ src/encoder_list.c | 5 + 3 files changed, 397 insertions(+) create mode 100644 src/encoder/vorbis_encoder.c (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 2ec4c9ccc..9d3529827 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -348,6 +348,10 @@ endif if ENABLE_ENCODER mpd_SOURCES += encoder_list.c + +if ENABLE_VORBIS_ENCODER +mpd_SOURCES += encoder/vorbis_encoder.c +endif endif diff --git a/src/encoder/vorbis_encoder.c b/src/encoder/vorbis_encoder.c new file mode 100644 index 000000000..6b4ec5e73 --- /dev/null +++ b/src/encoder/vorbis_encoder.c @@ -0,0 +1,388 @@ +/* + * Copyright (C) 2003-2009 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "encoder_api.h" +#include "encoder_plugin.h" +#include "tag.h" +#include "audio_format.h" + +#include + +#include + +#undef G_LOG_DOMAIN +#define G_LOG_DOMAIN "vorbis_encoder" + +struct vorbis_encoder { + /** the base class */ + struct encoder encoder; + + /* configuration */ + + float quality; + int bitrate; + + /* runtime information */ + + struct audio_format audio_format; + + ogg_stream_state os; + ogg_page page; + + vorbis_dsp_state vd; + vorbis_block vb; + vorbis_info vi; + vorbis_comment vc; +}; + +extern const struct encoder_plugin vorbis_encoder_plugin; + +static inline GQuark +vorbis_encoder_quark(void) +{ + return g_quark_from_static_string("vorbis_encoder"); +} + +static bool +vorbis_encoder_configure(struct vorbis_encoder *encoder, + const struct config_param *param, GError **error) +{ + const char *value; + char *endptr; + + value = config_get_block_string(param, "quality", NULL); + if (value != NULL) { + /* a quality was configured (VBR) */ + + encoder->quality = g_ascii_strtod(value, &endptr); + + if (*endptr != '\0' || encoder->quality < -1.0 || + encoder->quality > 10.0) { + g_set_error(error, vorbis_encoder_quark(), 0, + "quality \"%s\" is not a number in the " + "range -1 to 10, line %i", + value, param->line); + return false; + } + + if (config_get_block_string(param, "bitrate", NULL) != NULL) { + g_set_error(error, vorbis_encoder_quark(), 0, + "quality and bitrate are " + "both defined (line %i)", + param->line); + return false; + } + } else { + /* a bit rate was configured */ + + value = config_get_block_string(param, "bitrate", NULL); + if (value == NULL) { + g_set_error(error, vorbis_encoder_quark(), 0, + "neither bitrate nor quality defined " + "at line %i", + param->line); + return false; + } + + encoder->quality = -2.0; + encoder->bitrate = g_ascii_strtoll(value, &endptr, 10); + + if (*endptr != '\0' || encoder->bitrate <= 0) { + g_set_error(error, vorbis_encoder_quark(), 0, + "bitrate at line %i should be a positive integer", + param->line); + return false; + } + } + + return true; +} + +static struct encoder * +vorbis_encoder_init(const struct config_param *param, GError **error) +{ + struct vorbis_encoder *encoder; + + encoder = g_new(struct vorbis_encoder, 1); + encoder_struct_init(&encoder->encoder, &vorbis_encoder_plugin); + + /* load configuration from "param" */ + if (!vorbis_encoder_configure(encoder, param, error)) { + /* configuration has failed, roll back and return error */ + g_free(encoder); + return NULL; + } + + return &encoder->encoder; +} + +static void +vorbis_encoder_finish(struct encoder *_encoder) +{ + struct vorbis_encoder *encoder = (struct vorbis_encoder *)_encoder; + + /* the real libvorbis/libogg cleanup was already performed by + vorbis_encoder_close(), so no real work here */ + g_free(encoder); +} + +static bool +vorbis_encoder_reinit(struct vorbis_encoder *encoder, GError **error) +{ + vorbis_info_init(&encoder->vi); + + if (encoder->quality >= -1.0) { + /* a quality was configured (VBR) */ + + if (0 != vorbis_encode_init_vbr(&encoder->vi, + encoder->audio_format.channels, + encoder->audio_format.sample_rate, + encoder->quality * 0.1)) { + g_set_error(error, vorbis_encoder_quark(), 0, + "error initializing vorbis vbr"); + vorbis_info_clear(&encoder->vi); + return false; + } + } else { + /* a bit rate was configured */ + + if (0 != vorbis_encode_init(&encoder->vi, + encoder->audio_format.channels, + encoder->audio_format.sample_rate, -1.0, + encoder->bitrate * 1000, -1.0)) { + g_set_error(error, vorbis_encoder_quark(), 0, + "error initializing vorbis encoder"); + vorbis_info_clear(&encoder->vi); + return false; + } + } + + vorbis_analysis_init(&encoder->vd, &encoder->vi); + vorbis_block_init(&encoder->vd, &encoder->vb); + ogg_stream_init(&encoder->os, g_random_int()); + vorbis_comment_init(&encoder->vc); + + return true; +} + +static void +vorbis_encoder_send_header(struct vorbis_encoder *encoder) +{ + ogg_packet packet, comments, codebooks; + + vorbis_analysis_headerout(&encoder->vd, &encoder->vc, + &packet, &comments, &codebooks); + + ogg_stream_packetin(&encoder->os, &packet); + ogg_stream_packetin(&encoder->os, &comments); + ogg_stream_packetin(&encoder->os, &codebooks); +} + +static bool +vorbis_encoder_open(struct encoder *_encoder, + struct audio_format *audio_format, + GError **error) +{ + struct vorbis_encoder *encoder = (struct vorbis_encoder *)_encoder; + bool ret; + + audio_format->bits = 16; + + encoder->audio_format = *audio_format; + memset(&encoder->page, 0, sizeof(encoder->page)); + + ret = vorbis_encoder_reinit(encoder, error); + if (!ret) + return false; + + vorbis_encoder_send_header(encoder); + return true; +} + +static bool +vorbis_encoder_clear(struct vorbis_encoder *encoder) +{ + bool ret; + + vorbis_comment_clear(&encoder->vc); + ogg_stream_clear(&encoder->os); + vorbis_block_clear(&encoder->vb); + vorbis_dsp_clear(&encoder->vd); + vorbis_info_clear(&encoder->vi); + + return ret; +} + +static void +vorbis_encoder_close(struct encoder *_encoder) +{ + struct vorbis_encoder *encoder = (struct vorbis_encoder *)_encoder; + + vorbis_encoder_clear(encoder); +} + +static void +vorbis_encoder_blockout(struct vorbis_encoder *encoder) +{ + while (vorbis_analysis_blockout(&encoder->vd, &encoder->vb) == 1) { + ogg_packet packet; + + vorbis_analysis(&encoder->vb, NULL); + vorbis_bitrate_addblock(&encoder->vb); + + while (vorbis_bitrate_flushpacket(&encoder->vd, &packet)) + ogg_stream_packetin(&encoder->os, &packet); + } +} + +static bool +vorbis_encoder_flush(struct encoder *_encoder, G_GNUC_UNUSED GError **error) +{ + struct vorbis_encoder *encoder = (struct vorbis_encoder *)_encoder; + + vorbis_analysis_wrote(&encoder->vd, 0); + vorbis_encoder_blockout(encoder); + ogg_stream_flush(&encoder->os, &encoder->page); + + return true; +} + +static void add_tag(struct vorbis_encoder *encoder, + const char *name, char *value) +{ + if (value) { + union { + const char *in; + char *out; + } u = { .in = name }; + vorbis_comment_add_tag(&encoder->vc, u.out, value); + } +} + +static void +copy_tag_to_vorbis_comment(struct vorbis_encoder *encoder, + const struct tag *tag) +{ + for (unsigned i = 0; i < tag->numOfItems; i++) { + switch (tag->items[i]->type) { + case TAG_ITEM_ARTIST: + add_tag(encoder, "ARTIST", tag->items[i]->value); + break; + + case TAG_ITEM_ALBUM: + add_tag(encoder, "ALBUM", tag->items[i]->value); + break; + + case TAG_ITEM_TITLE: + add_tag(encoder, "TITLE", tag->items[i]->value); + break; + + default: + break; + } + } +} + +static bool +vorbis_encoder_tag(struct encoder *_encoder, const struct tag *tag, + GError **error) +{ + struct vorbis_encoder *encoder = (struct vorbis_encoder *)_encoder; + + vorbis_encoder_clear(encoder); + if (!vorbis_encoder_reinit(encoder, error)) + return false; + + copy_tag_to_vorbis_comment(encoder, tag); + + vorbis_encoder_send_header(encoder); + + return true; +} + +static void +pcm16_to_vorbis_buffer(float **dest, const int16_t *src, + unsigned num_frames, unsigned num_channels) +{ + for (unsigned i = 0; i < num_frames; i++) + for (unsigned j = 0; j < num_channels; j++) + dest[j][i] = *src++ / 32768.0; +} + +static bool +vorbis_encoder_write(struct encoder *_encoder, + const void *data, size_t length, + G_GNUC_UNUSED GError **error) +{ + struct vorbis_encoder *encoder = (struct vorbis_encoder *)_encoder; + unsigned num_frames; + + assert(encoder->page.header_len == 0 && encoder->page.body_len == 0); + + num_frames = length / audio_format_frame_size(&encoder->audio_format); + + /* this is for only 16-bit audio */ + + pcm16_to_vorbis_buffer(vorbis_analysis_buffer(&encoder->vd, + num_frames), + (const int16_t *)data, + num_frames, encoder->audio_format.channels); + + vorbis_analysis_wrote(&encoder->vd, num_frames); + vorbis_encoder_blockout(encoder); + ogg_stream_pageout(&encoder->os, &encoder->page); + return true; +} + +static size_t +vorbis_encoder_read(struct encoder *_encoder, void *_dest, size_t length) +{ + struct vorbis_encoder *encoder = (struct vorbis_encoder *)_encoder; + unsigned char *dest = _dest; + size_t nbytes; + + if (encoder->page.header_len == 0 && encoder->page.body_len == 0) + return 0; + + nbytes = (size_t)encoder->page.header_len + + (size_t)encoder->page.body_len; + + if (nbytes > length) + /* XXX better error handling */ + g_error("buffer too small"); + + memcpy(dest, encoder->page.header, encoder->page.header_len); + memcpy(dest + encoder->page.header_len, encoder->page.body, + encoder->page.body_len); + + memset(&encoder->page, 0, sizeof(encoder->page)); + + return nbytes; +} + +const struct encoder_plugin vorbis_encoder_plugin = { + .name = "vorbis", + .init = vorbis_encoder_init, + .finish = vorbis_encoder_finish, + .open = vorbis_encoder_open, + .close = vorbis_encoder_close, + .flush = vorbis_encoder_flush, + .tag = vorbis_encoder_tag, + .write = vorbis_encoder_write, + .read = vorbis_encoder_read, +}; diff --git a/src/encoder_list.c b/src/encoder_list.c index 4108b97a0..9b384490c 100644 --- a/src/encoder_list.c +++ b/src/encoder_list.c @@ -22,7 +22,12 @@ #include +extern const struct encoder_plugin vorbis_encoder_plugin; + static const struct encoder_plugin *encoder_plugins[] = { +#ifdef ENABLE_VORBIS_ENCODER + &vorbis_encoder_plugin, +#endif NULL }; -- cgit v1.2.3