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

vorbis_encoder: fill the ogg_page in the read() method

Browse Source 
Add the "flush" flag, and defer the ogg_stream_flush() call.  Call
ogg_stream_pageout() or ogg_stream_flush() (depending on the "flush"
flag) in vorbis_encoder_read().  This prevents the ogg_page from
getting overwritten by consecutive ogg_stream_pageout() calls.
This commit is contained in:
Max Kellermann 2009-03-15 02:23:36 +01:00
parent c8c3920500
commit 65cc280e1a
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/encoder/vorbis_encoder.c
View File

@ -49,6 +49,8 @@ struct vorbis_encoder {
vorbis_block vb; vorbis_block vb;
vorbis_info vi; vorbis_info vi;
vorbis_comment vc; vorbis_comment vc;
bool flush;
}; };
extern const struct encoder_plugin vorbis_encoder_plugin; extern const struct encoder_plugin vorbis_encoder_plugin;
@ -212,6 +214,11 @@ vorbis_encoder_open(struct encoder *_encoder,
return false; return false;
vorbis_encoder_send_header(encoder); vorbis_encoder_send_header(encoder);
/* set "flush" to true, so the caller gets the full headers on
the first read() */
encoder->flush = true;
return true; return true;
} }
@ -254,8 +261,8 @@ vorbis_encoder_flush(struct encoder *_encoder, G_GNUC_UNUSED GError **error)
vorbis_analysis_wrote(&encoder->vd, 0); vorbis_analysis_wrote(&encoder->vd, 0);
vorbis_encoder_blockout(encoder); vorbis_encoder_blockout(encoder);
ogg_stream_flush(&encoder->os, &encoder->page);
encoder->flush = true;
return true; return true;
} }
@ -342,7 +349,6 @@ vorbis_encoder_write(struct encoder *_encoder,
vorbis_analysis_wrote(&encoder->vd, num_frames); vorbis_analysis_wrote(&encoder->vd, num_frames);
vorbis_encoder_blockout(encoder); vorbis_encoder_blockout(encoder);
ogg_stream_pageout(&encoder->os, &encoder->page);
return true; return true;
} }
@ -353,8 +359,21 @@ vorbis_encoder_read(struct encoder *_encoder, void *_dest, size_t length)
unsigned char *dest = _dest; unsigned char *dest = _dest;
size_t nbytes; size_t nbytes;
if (encoder->page.header_len == 0 && encoder->page.body_len == 0) if (encoder->page.header_len == 0 && encoder->page.body_len == 0) {
return 0; int ret;
ret = ogg_stream_pageout(&encoder->os, &encoder->page);
if (ret == 0 && encoder->flush) {
encoder->flush = false;
ret = ogg_stream_flush(&encoder->os, &encoder->page);
}
if (ret == 0)
return 0;
assert(encoder->page.header_len > 0 ||
encoder->page.body_len > 0);
}
nbytes = (size_t)encoder->page.header_len + nbytes = (size_t)encoder->page.header_len +
(size_t)encoder->page.body_len; (size_t)encoder->page.body_len;