FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Cleaned up the vorbis plugin

Browse Source 
Original commit message from CVS:
Cleaned up the vorbis plugin
- handle EOS.
- throw some info to the app.
This commit is contained in:
Wim Taymans 2001-12-21 00:15:29 +00:00
parent ecf59e0e9b
commit afc5bb747d
2 changed files with 219 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
ext/vorbis/vorbisdec.c
View File

@ -20,7 +20,6 @@
#include <string.h> #include <string.h>
#include <sys/soundcard.h> #include <sys/soundcard.h>
/*#define DEBUG_ENABLED */
#include <vorbisdec.h> #include <vorbisdec.h>
static void gst_vorbisdec_loop (GstElement * element); static void gst_vorbisdec_loop (GstElement * element);
@ -28,33 +27,26 @@ static void gst_vorbisdec_loop (GstElement *element);
extern GstPadTemplate *dec_src_template, *dec_sink_template; extern GstPadTemplate *dec_src_template, *dec_sink_template;
/* elementfactory information */ /* elementfactory information */
GstElementDetails vorbisdec_details = { GstElementDetails vorbisdec_details =
{
"Ogg Vorbis decoder", "Ogg Vorbis decoder",
"Filter/Audio/Decoder", "Filter/Audio/Decoder",
"Decodes OGG Vorbis audio", "Decodes OGG Vorbis audio",
VERSION, VERSION,
"Monty <monty@xiph.org>, "\ "Monty <monty@xiph.org>, "
"Wim Taymans <wim.taymans@chello.be>", "Wim Taymans <wim.taymans@chello.be>",
"(C) 2000", "(C) 2000",
}; };
#define VORBIS_INIT 1
#define VORBIS_HEADER1 2
#define VORBIS_HEADER2 3
#define VORBIS_INFO 4
#define VORBIS_MAIN_LOOP 5
#define VORBIS_CLEAN 6
#define VORBIS_EXIT 7
#define VORBIS_DONE 8
#define VORBIS_ERROR 9
/* VorbisDec signals and args */ /* VorbisDec signals and args */
enum { enum
{
/* FILL ME */ /* FILL ME */
LAST_SIGNAL LAST_SIGNAL
}; };
enum { enum
{
ARG_0, ARG_0,
}; };
@ -63,10 +55,12 @@ static void gst_vorbisdec_init (VorbisDec *vorbisdec);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
/*static guint gst_vorbisdec_signals[LAST_SIGNAL] = { 0 }; */ /*static guint gst_vorbisdec_signals[LAST_SIGNAL] = { 0 }; */
GType GType
vorbisdec_get_type(void) { vorbisdec_get_type (void)
{
static GType vorbisdec_type = 0; static GType vorbisdec_type = 0;
if (!vorbisdec_type) { if (!vorbisdec_type) {
@ -80,6 +74,7 @@ vorbisdec_get_type(void) {
0, 0,
(GInstanceInitFunc) gst_vorbisdec_init, (GInstanceInitFunc) gst_vorbisdec_init,
}; };
vorbisdec_type = g_type_register_static (GST_TYPE_ELEMENT, "VorbisDec", &vorbisdec_info, 0); vorbisdec_type = g_type_register_static (GST_TYPE_ELEMENT, "VorbisDec", &vorbisdec_info, 0);
} }
return vorbisdec_type; return vorbisdec_type;
@ -106,10 +101,37 @@ gst_vorbisdec_init (VorbisDec *vorbisdec)
gst_element_add_pad (GST_ELEMENT (vorbisdec), vorbisdec->srcpad); gst_element_add_pad (GST_ELEMENT (vorbisdec), vorbisdec->srcpad);
ogg_sync_init (&vorbisdec->oy); /* Now we can read pages */ ogg_sync_init (&vorbisdec->oy); /* Now we can read pages */
vorbisdec->state = VORBIS_INIT;
vorbisdec->convsize = 4096; vorbisdec->convsize = 4096;
} }
static GstBuffer *
gst_vorbisdec_pull (VorbisDec * vorbisdec, ogg_sync_state * oy)
{
GstBuffer *buf;
do {
GST_DEBUG (0, "vorbisdec: pull \n");
buf = gst_pad_pull (vorbisdec->sinkpad);
if (GST_IS_EVENT (buf)) {
switch (GST_EVENT_TYPE (buf)) {
case GST_EVENT_FLUSH:
ogg_sync_reset (oy);
case GST_EVENT_EOS:
default:
gst_pad_event_default (vorbisdec->sinkpad, GST_EVENT (buf));
break;
}
buf = NULL;
}
} while (buf == NULL);
GST_DEBUG (0, "vorbisdec: pull done\n");
return buf;
}
static void static void
gst_vorbisdec_loop (GstElement * element) gst_vorbisdec_loop (GstElement * element)
{ {
@ -143,7 +165,6 @@ gst_vorbisdec_loop (GstElement *element)
while (1) { /* we repeat if the bitstream is chained */ while (1) { /* we repeat if the bitstream is chained */
int eos = 0; int eos = 0;
int i; int i;
gboolean need_sync = FALSE;
/* grab some data at the head of the stream. We want the first page /* grab some data at the head of the stream. We want the first page
(which is guaranteed to be small and only contain the Vorbis (which is guaranteed to be small and only contain the Vorbis
@ -157,17 +178,9 @@ gst_vorbisdec_loop (GstElement *element)
} }
/* submit a 4k block to libvorbis' Ogg layer */ /* submit a 4k block to libvorbis' Ogg layer */
GST_DEBUG (0,"vorbisdec: pull\n"); buf = gst_vorbisdec_pull (vorbisdec, &oy);
buf = gst_pad_pull (vorbisdec->sinkpad);
if (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLUSH)) {
/*g_print("reset\n"); */
ogg_sync_reset(&oy);
need_sync = TRUE;
}
GST_DEBUG (0,"vorbisdec: pull done\n");
bytes = GST_BUFFER_SIZE (buf); bytes = GST_BUFFER_SIZE (buf);
buffer = ogg_sync_buffer (&oy, bytes); buffer = ogg_sync_buffer (&oy, bytes);
memcpy (buffer, GST_BUFFER_DATA (buf), bytes); memcpy (buffer, GST_BUFFER_DATA (buf), bytes);
@ -175,16 +188,8 @@ gst_vorbisdec_loop (GstElement *element)
/* Get the first page. */ /* Get the first page. */
if (ogg_sync_pageout (&oy, &og) != 1) { if (ogg_sync_pageout (&oy, &og) != 1) {
/* have we simply run out of data? If so, we're done. */
if (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_EOS)) {
gst_buffer_unref (buf);
break;
}
/* error case. Must not be Vorbis data */ /* error case. Must not be Vorbis data */
GST_DEBUG (0,"Input does not appear to be an Ogg bitstream.\n"); g_warning ("Input does not appear to be an Ogg bitstream.\n");
/* FIXME */
/* exit(1); */
} }
gst_buffer_unref (buf); gst_buffer_unref (buf);
@ -204,24 +209,17 @@ gst_vorbisdec_loop (GstElement *element)
vorbis_comment_init (&vc); vorbis_comment_init (&vc);
if (ogg_stream_pagein (&os, &og) < 0) { if (ogg_stream_pagein (&os, &og) < 0) {
/* error; stream version mismatch perhaps */ /* error; stream version mismatch perhaps */
printf("Error reading first page of Ogg bitstream data.\n"); g_warning ("Error reading first page of Ogg bitstream data.\n");
/* FIXME */
/* exit(1); */
} }
if (ogg_stream_packetout (&os, &op) != 1) { if (ogg_stream_packetout (&os, &op) != 1) {
/* no page? must not be vorbis */ /* no page? must not be vorbis */
printf("Error reading initial header packet.\n"); g_warning ("Error reading initial header packet.\n");
/* FIXME */
/* exit(1); */
} }
if (vorbis_synthesis_headerin (&vi, &vc, &op) < 0) { if (vorbis_synthesis_headerin (&vi, &vc, &op) < 0) {
/* error case; not a vorbis header */ /* error case; not a vorbis header */
printf("This Ogg bitstream does not contain Vorbis " g_warning ("This Ogg bitstream does not contain Vorbis " "audio data.\n");
"audio data.\n");
/* FIXME */
/* exit(1); */
} }
/* At this point, we're sure we're Vorbis. We've set up the logical /* At this point, we're sure we're Vorbis. We've set up the logical
@ -238,7 +236,9 @@ gst_vorbisdec_loop (GstElement *element)
while (i < 2) { while (i < 2) {
while (i < 2) { while (i < 2) {
int result = ogg_sync_pageout (&oy, &og); int result = ogg_sync_pageout (&oy, &og);
if (result == 0) break; /* Need more data */
if (result == 0)
break; /* Need more data */
/* Don't complain about missing or corrupt data yet. We'll /* Don't complain about missing or corrupt data yet. We'll
catch it at the packet output phase */ catch it at the packet output phase */
if (result == 1) { if (result == 1) {
@ -247,43 +247,35 @@ gst_vorbisdec_loop (GstElement *element)
at packetout */ at packetout */
while (i < 2) { while (i < 2) {
result = ogg_stream_packetout (&os, &op); result = ogg_stream_packetout (&os, &op);
if (result == 0) break; if (result == 0)
break;
if (result == -1) { if (result == -1) {
/* Uh oh; data at some point was corrupted or missing! /* Uh oh; data at some point was corrupted or missing!
We can't tolerate that in a header. Die. */ We can't tolerate that in a header. Die. */
printf("Corrupt secondary header. Exiting.\n"); g_warning ("Corrupt secondary header. expect trouble\n");
/* FIXME */
/* exit(1); */
} }
vorbis_synthesis_headerin (&vi, &vc, &op); vorbis_synthesis_headerin (&vi, &vc, &op);
i++; i++;
} }
} }
} }
/* no harm in not checking before adding more */ /* no harm in not checkiindent: Standard input:375: Warning:old style assignment ambiguity in "=-". Assuming "= -"
ng before adding more */
/* FIXME HACK! trap COTHREAD_STOPPING here */ /* FIXME HACK! trap COTHREAD_STOPPING here */
if (GST_ELEMENT_IS_COTHREAD_STOPPING (vorbisdec)) { if (GST_ELEMENT_IS_COTHREAD_STOPPING (vorbisdec)) {
GST_DEBUG (0, "HACK HACK HACK, switching to cothread zero on COTHREAD_STOPPING\n"); GST_DEBUG (0, "HACK HACK HACK, switching to cothread zero on COTHREAD_STOPPING\n");
cothread_switch (cothread_current_main ()); cothread_switch (cothread_current_main ());
} }
GST_DEBUG (0,"vorbisdec: pull\n"); buf = gst_vorbisdec_pull (vorbisdec, &oy);
buf = gst_pad_pull (vorbisdec->sinkpad);
if (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLUSH)) {
/*g_print("reset\n"); */
ogg_sync_reset(&oy);
need_sync = TRUE;
}
GST_DEBUG (0,"vorbisdec: pull done\n");
bytes = GST_BUFFER_SIZE (buf); bytes = GST_BUFFER_SIZE (buf);
buffer = ogg_sync_buffer (&oy, bytes); buffer = ogg_sync_buffer (&oy, bytes);
memcpy (buffer, GST_BUFFER_DATA (buf), bytes); memcpy (buffer, GST_BUFFER_DATA (buf), bytes);
gst_buffer_unref (buf); gst_buffer_unref (buf);
if (bytes == 0 && i < 2) { if (bytes == 0 && i < 2) {
fprintf(stderr,"End of file before finding all Vorbis headers!\n"); g_warning ("End of file before finding all Vorbis headers! expect trouble..\n");
/* FIXME */
/* exit(1); */
} }
ogg_sync_wrote (&oy, bytes); ogg_sync_wrote (&oy, bytes);
} }
@ -292,20 +284,35 @@ gst_vorbisdec_loop (GstElement *element)
decoding */ decoding */
{ {
char **ptr = vc.user_comments; char **ptr = vc.user_comments;
while (*ptr) { while (*ptr) {
GST_INFO (GST_CAT_PLUGIN_INFO, "vorbisdec: %s\n",*ptr); gst_element_send_event (GST_ELEMENT (vorbisdec),
gst_event_new_info ("comment", GST_PROPS_STRING (*ptr), NULL));
++ptr; ++ptr;
} }
GST_INFO (GST_CAT_PLUGIN_INFO, "vorbisdec: Bitstream is %d channel, %ldHz", vi.channels, vi.rate); gst_element_send_event (GST_ELEMENT (vorbisdec),
GST_INFO (GST_CAT_PLUGIN_INFO, "vorbisdec: Encoded by: %s", vc.vendor); gst_event_new_info ("vendor", GST_PROPS_STRING (vc.vendor), NULL));
gst_element_send_event (GST_ELEMENT (vorbisdec),
gst_event_new_info ("version", GST_PROPS_INT (vi.version), NULL));
gst_element_send_event (GST_ELEMENT (vorbisdec),
gst_event_new_info ("channels", GST_PROPS_INT (vi.channels), NULL));
gst_element_send_event (GST_ELEMENT (vorbisdec),
gst_event_new_info ("rate", GST_PROPS_INT (vi.rate), NULL));
gst_element_send_event (GST_ELEMENT (vorbisdec),
gst_event_new_info ("bitrate_upper", GST_PROPS_INT (vi.bitrate_upper), NULL));
gst_element_send_event (GST_ELEMENT (vorbisdec),
gst_event_new_info ("bitrate_nominal", GST_PROPS_INT (vi.bitrate_nominal), NULL));
gst_element_send_event (GST_ELEMENT (vorbisdec),
gst_event_new_info ("bitrate_lower", GST_PROPS_INT (vi.bitrate_lower), NULL));
gst_element_send_event (GST_ELEMENT (vorbisdec),
gst_event_new_info ("bitrate_window", GST_PROPS_INT (vi.bitrate_window), NULL));
} }
gst_pad_set_caps (vorbisdec->srcpad, gst_pad_set_caps (vorbisdec->srcpad,
gst_caps_new ( gst_caps_new ("vorbisdec_src",
"vorbisdec_src",
"audio/raw", "audio/raw",
gst_props_new ( gst_props_new ("format", GST_PROPS_STRING ("int"),
"format", GST_PROPS_STRING ("int"),
"law", GST_PROPS_INT (0), "law", GST_PROPS_INT (0),
"endianness", GST_PROPS_INT (G_BYTE_ORDER), "endianness", GST_PROPS_INT (G_BYTE_ORDER),
"signed", GST_PROPS_BOOLEAN (TRUE), "signed", GST_PROPS_BOOLEAN (TRUE),
@ -313,8 +320,7 @@ gst_vorbisdec_loop (GstElement *element)
"depth", GST_PROPS_INT (16), "depth", GST_PROPS_INT (16),
"rate", GST_PROPS_INT (vi.rate), "rate", GST_PROPS_INT (vi.rate),
"channels", GST_PROPS_INT (vi.channels), "channels", GST_PROPS_INT (vi.channels),
NULL NULL)));
)));
vorbisdec->convsize = 4096 / vi.channels; vorbisdec->convsize = 4096 / vi.channels;
@ -331,18 +337,23 @@ gst_vorbisdec_loop (GstElement *element)
while (!eos) { while (!eos) {
while (!eos) { while (!eos) {
int result = ogg_sync_pageout (&oy, &og); int result = ogg_sync_pageout (&oy, &og);
if (result ==0) break; /* need more data */
if (result == 0)
break; /* need more data */
if (result == -1) { /* missing or corrupt data at this page position */ if (result == -1) { /* missing or corrupt data at this page position */
} else { }
else {
ogg_stream_pagein (&os, &og); /* can safely ignore errors at ogg_stream_pagein (&os, &og); /* can safely ignore errors at
this point */ this point */
while (1) { while (1) {
result = ogg_stream_packetout (&os, &op); result = ogg_stream_packetout (&os, &op);
if (result == 0) break; /* need more data */ if (result == 0)
break; /* need more data */
if (result == -1) { /* missing or corrupt data at this page position */ if (result == -1) { /* missing or corrupt data at this page position */
/* no reason to complain; already complained above */ /* no reason to complain; already complained above */
} else { }
else {
/* we have a packet. Decode it */ /* we have a packet. Decode it */
float **pcm; float **pcm;
int samples; int samples;
@ -350,9 +361,7 @@ gst_vorbisdec_loop (GstElement *element)
if (vorbis_synthesis (&vb, &op) == 0) /* test for success! */ if (vorbis_synthesis (&vb, &op) == 0) /* test for success! */
vorbis_synthesis_blockin (&vd, &vb); vorbis_synthesis_blockin (&vd, &vb);
/* /*
**pcm is a multichannel double vector. In stereo, for **pcm is a multichannel double vector. In stereo, for
example, pcm[0] is left, and pcm[1] is right. samples is example, pcm[0] is left, and pcm[1] is right. samples is
the size of each channel. Convert the float values the size of each channel. Convert the float values
@ -372,8 +381,10 @@ gst_vorbisdec_loop (GstElement *element)
for (i = 0; i < vi.channels; i++) { for (i = 0; i < vi.channels; i++) {
int16_t *ptr = ((int16_t *) GST_BUFFER_DATA (outbuf)) + i; int16_t *ptr = ((int16_t *) GST_BUFFER_DATA (outbuf)) + i;
float *mono = pcm[i]; float *mono = pcm[i];
for (j = 0; j < bout; j++) { for (j = 0; j < bout; j++) {
int val = mono[j] * 32767.; int val = mono[j] * 32767.;
/* might as well guard against clipping */ /* might as well guard against clipping */
if (val > 32767) { if (val > 32767) {
val = 32767; val = 32767;
@ -388,11 +399,6 @@ gst_vorbisdec_loop (GstElement *element)
} }
} }
if (need_sync) {
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLUSH);
need_sync = FALSE;
}
GST_DEBUG (0, "vorbisdec: push\n"); GST_DEBUG (0, "vorbisdec: push\n");
gst_pad_push (vorbisdec->srcpad, outbuf); gst_pad_push (vorbisdec->srcpad, outbuf);
GST_DEBUG (0, "vorbisdec: push done\n"); GST_DEBUG (0, "vorbisdec: push done\n");
@ -403,7 +409,8 @@ gst_vorbisdec_loop (GstElement *element)
} }
} }
} }
if (ogg_page_eos (&og)) eos=1; if (ogg_page_eos (&og))
eos = 1;
} }
} }
if (!eos) { if (!eos) {
@ -414,14 +421,7 @@ gst_vorbisdec_loop (GstElement *element)
cothread_switch (cothread_current_main ()); cothread_switch (cothread_current_main ());
} }
GST_DEBUG (0,"vorbisdec: pull\n"); buf = gst_vorbisdec_pull (vorbisdec, &oy);
buf = gst_pad_pull (vorbisdec->sinkpad);
if (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLUSH)) {
/*g_print("reset\n"); */
ogg_sync_reset(&oy);
need_sync = TRUE;
}
GST_DEBUG (0,"vorbisdec: pull done\n");
bytes = GST_BUFFER_SIZE (buf); bytes = GST_BUFFER_SIZE (buf);
buffer = ogg_sync_buffer (&oy, bytes); buffer = ogg_sync_buffer (&oy, bytes);
memcpy (buffer, GST_BUFFER_DATA (buf), bytes); memcpy (buffer, GST_BUFFER_DATA (buf), bytes);
@ -429,7 +429,6 @@ gst_vorbisdec_loop (GstElement *element)
ogg_sync_wrote (&oy, bytes); ogg_sync_wrote (&oy, bytes);
if (bytes == 0) { if (bytes == 0) {
g_print("vorbisdec: eos reached\n");
eos = 1; eos = 1;
} }
} }
@ -450,7 +449,4 @@ gst_vorbisdec_loop (GstElement *element)
/* OK, clean up the framer */ /* OK, clean up the framer */
ogg_sync_clear (&oy); ogg_sync_clear (&oy);
g_print("vorbisdec: end\n");
} }

1
ext/vorbis/vorbisdec.h
View File

@ -64,7 +64,6 @@ struct _VorbisDec {
vorbis_block vb; /* local working space for packet->PCM decode */ vorbis_block vb; /* local working space for packet->PCM decode */
gboolean eos; gboolean eos;
guint state;
int16_t convsize; int16_t convsize;
}; };