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

encoder/vorbis: make variables more local

Browse Source
This commit is contained in:
Max Kellermann 2012-10-01 23:46:38 +02:00
parent 43d8252050
commit d115507502
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/encoder/vorbis_encoder.c
View File

@ -65,13 +65,11 @@ static bool
vorbis_encoder_configure(struct vorbis_encoder *encoder, vorbis_encoder_configure(struct vorbis_encoder *encoder,
const struct config_param *param, GError **error) const struct config_param *param, GError **error)
{ {
const char *value; const char *value = config_get_block_string(param, "quality", NULL);
char *endptr;
value = config_get_block_string(param, "quality", NULL);
if (value != NULL) { if (value != NULL) {
/* a quality was configured (VBR) */ /* a quality was configured (VBR) */
char *endptr;
encoder->quality = g_ascii_strtod(value, &endptr); encoder->quality = g_ascii_strtod(value, &endptr);
if (*endptr != '\0' || encoder->quality < -1.0 || if (*endptr != '\0' || encoder->quality < -1.0 ||
@ -103,8 +101,9 @@ vorbis_encoder_configure(struct vorbis_encoder *encoder,
} }
encoder->quality = -2.0; encoder->quality = -2.0;
encoder->bitrate = g_ascii_strtoll(value, &endptr, 10);
char *endptr;
encoder->bitrate = g_ascii_strtoll(value, &endptr, 10);
if (*endptr != '\0' || encoder->bitrate <= 0) { if (*endptr != '\0' || encoder->bitrate <= 0) {
g_set_error(error, vorbis_encoder_quark(), 0, g_set_error(error, vorbis_encoder_quark(), 0,
"bitrate at line %i should be a positive integer", "bitrate at line %i should be a positive integer",
@ -119,9 +118,7 @@ vorbis_encoder_configure(struct vorbis_encoder *encoder,
static struct encoder * static struct encoder *
vorbis_encoder_init(const struct config_param *param, GError **error) vorbis_encoder_init(const struct config_param *param, GError **error)
{ {
struct vorbis_encoder *encoder; struct vorbis_encoder *encoder = g_new(struct vorbis_encoder, 1);
encoder = g_new(struct vorbis_encoder, 1);
encoder_struct_init(&encoder->encoder, &vorbis_encoder_plugin); encoder_struct_init(&encoder->encoder, &vorbis_encoder_plugin);
/* load configuration from "param" */ /* load configuration from "param" */
@ -211,14 +208,12 @@ vorbis_encoder_open(struct encoder *_encoder,
GError **error) GError **error)
{ {
struct vorbis_encoder *encoder = (struct vorbis_encoder *)_encoder; struct vorbis_encoder *encoder = (struct vorbis_encoder *)_encoder;
bool ret;
audio_format->format = SAMPLE_FORMAT_S16; audio_format->format = SAMPLE_FORMAT_S16;
encoder->audio_format = *audio_format; encoder->audio_format = *audio_format;
ret = vorbis_encoder_reinit(encoder, error); if (!vorbis_encoder_reinit(encoder, error))
if (!ret)
return false; return false;
vorbis_encoder_send_header(encoder); vorbis_encoder_send_header(encoder);
@ -251,11 +246,10 @@ static void
vorbis_encoder_blockout(struct vorbis_encoder *encoder) vorbis_encoder_blockout(struct vorbis_encoder *encoder)
{ {
while (vorbis_analysis_blockout(&encoder->vd, &encoder->vb) == 1) { while (vorbis_analysis_blockout(&encoder->vd, &encoder->vb) == 1) {
ogg_packet packet;
vorbis_analysis(&encoder->vb, NULL); vorbis_analysis(&encoder->vb, NULL);
vorbis_bitrate_addblock(&encoder->vb); vorbis_bitrate_addblock(&encoder->vb);
ogg_packet packet;
while (vorbis_bitrate_flushpacket(&encoder->vd, &packet)) while (vorbis_bitrate_flushpacket(&encoder->vd, &packet))
ogg_stream_packetin(&encoder->os, &packet); ogg_stream_packetin(&encoder->os, &packet);
} }
@ -344,9 +338,9 @@ vorbis_encoder_write(struct encoder *_encoder,
G_GNUC_UNUSED GError **error) G_GNUC_UNUSED GError **error)
{ {
struct vorbis_encoder *encoder = (struct vorbis_encoder *)_encoder; struct vorbis_encoder *encoder = (struct vorbis_encoder *)_encoder;
unsigned num_frames;
num_frames = length / audio_format_frame_size(&encoder->audio_format); unsigned num_frames = length
/ audio_format_frame_size(&encoder->audio_format);
/* this is for only 16-bit audio */ /* this is for only 16-bit audio */
@ -364,12 +358,10 @@ static size_t
vorbis_encoder_read(struct encoder *_encoder, void *_dest, size_t length) vorbis_encoder_read(struct encoder *_encoder, void *_dest, size_t length)
{ {
struct vorbis_encoder *encoder = (struct vorbis_encoder *)_encoder; struct vorbis_encoder *encoder = (struct vorbis_encoder *)_encoder;
ogg_page page;
int ret;
unsigned char *dest = _dest; unsigned char *dest = _dest;
size_t nbytes;
ret = ogg_stream_pageout(&encoder->os, &page); ogg_page page;
int ret = ogg_stream_pageout(&encoder->os, &page);
if (ret == 0 && encoder->flush) { if (ret == 0 && encoder->flush) {
encoder->flush = false; encoder->flush = false;
ret = ogg_stream_flush(&encoder->os, &page); ret = ogg_stream_flush(&encoder->os, &page);
@ -381,7 +373,7 @@ vorbis_encoder_read(struct encoder *_encoder, void *_dest, size_t length)
assert(page.header_len > 0 || page.body_len > 0); assert(page.header_len > 0 || page.body_len > 0);
nbytes = (size_t)page.header_len + (size_t)page.body_len; size_t nbytes = (size_t)page.header_len + (size_t)page.body_len;
if (nbytes > length) if (nbytes > length)
/* XXX better error handling */ /* XXX better error handling */