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

vorbis: fix for new API

Browse Source
This commit is contained in:
Wim Taymans 2011-05-19 12:29:57 +02:00
parent 489eed9bb8
commit 5619a238c0
1 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ext/vorbis/gstvorbisdec.c
View File

@ -983,11 +983,16 @@ vorbis_dec_handle_header_buffer (GstVorbisDec * vd, GstBuffer * buffer)
{ {
ogg_packet *packet; ogg_packet *packet;
ogg_packet_wrapper packet_wrapper; ogg_packet_wrapper packet_wrapper;
GstFlowReturn ret;
gst_ogg_packet_wrapper_from_buffer (&packet_wrapper, buffer); gst_ogg_packet_wrapper_map (&packet_wrapper, buffer);
packet = gst_ogg_packet_from_wrapper (&packet_wrapper); packet = gst_ogg_packet_from_wrapper (&packet_wrapper);
return vorbis_handle_header_packet (vd, packet); ret = vorbis_handle_header_packet (vd, packet);
gst_ogg_packet_wrapper_unmap (&packet_wrapper, buffer);
return ret;
} }
@ -996,56 +1001,71 @@ static GstFlowReturn
vorbis_dec_handle_header_caps (GstVorbisDec * vd, GstBuffer * buffer) vorbis_dec_handle_header_caps (GstVorbisDec * vd, GstBuffer * buffer)
{ {
GstFlowReturn result = GST_FLOW_OK; GstFlowReturn result = GST_FLOW_OK;
GstCaps *caps = GST_PAD_CAPS (vd->sinkpad); GstCaps *caps;
GstStructure *s = gst_caps_get_structure (caps, 0); GstStructure *s;
const GValue *array = gst_structure_get_value (s, "streamheader"); const GValue *array;
if (array && (gst_value_array_get_size (array) >= MIN_NUM_HEADERS)) {
const GValue *value = NULL; const GValue *value = NULL;
GstBuffer *buf = NULL; GstBuffer *buf = NULL;
if ((caps = gst_pad_get_current_caps (vd->sinkpad)) == NULL)
goto no_caps;
if ((s = gst_caps_get_structure (caps, 0)) == NULL)
goto no_caps;
array = gst_structure_get_value (s, "streamheader");
if (array == NULL || (gst_value_array_get_size (array) < MIN_NUM_HEADERS))
goto array_error;
/* initial header */ /* initial header */
value = gst_value_array_get_value (array, 0); value = gst_value_array_get_value (array, 0);
buf = gst_value_get_buffer (value); buf = gst_value_get_buffer (value);
if (!buf) if (!buf)
goto null_buffer; goto null_buffer;
result = vorbis_dec_handle_header_buffer (vd, buf); result = vorbis_dec_handle_header_buffer (vd, buf);
if (result != GST_FLOW_OK)
goto buffer_error;
/* comment header */ /* comment header */
if (result == GST_FLOW_OK) {
value = gst_value_array_get_value (array, 1); value = gst_value_array_get_value (array, 1);
buf = gst_value_get_buffer (value); buf = gst_value_get_buffer (value);
if (!buf) if (!buf)
goto null_buffer; goto null_buffer;
result = vorbis_dec_handle_header_buffer (vd, buf); result = vorbis_dec_handle_header_buffer (vd, buf);
} if (result != GST_FLOW_OK)
goto buffer_error;
/* bitstream codebook header */ /* bitstream codebook header */
if (result == GST_FLOW_OK) {
value = gst_value_array_get_value (array, 2); value = gst_value_array_get_value (array, 2);
buf = gst_value_get_buffer (value); buf = gst_value_get_buffer (value);
if (!buf) if (!buf)
goto null_buffer; goto null_buffer;
result = vorbis_dec_handle_header_buffer (vd, buf); result = vorbis_dec_handle_header_buffer (vd, buf);
if (result != GST_FLOW_OK)
goto buffer_error;
return result;
no_caps:
{
GST_WARNING_OBJECT (vd, "no caps negotiated");
return GST_FLOW_NOT_NEGOTIATED;
} }
} else
goto array_error;
done:
return (result != GST_FLOW_OK ? GST_FLOW_NOT_NEGOTIATED : GST_FLOW_OK);
array_error: array_error:
{ {
GST_WARNING_OBJECT (vd, "streamheader array not found"); GST_WARNING_OBJECT (vd, "streamheader array not found");
result = GST_FLOW_ERROR; return GST_FLOW_NOT_NEGOTIATED;
goto done;
} }
null_buffer: null_buffer:
{ {
GST_WARNING_OBJECT (vd, "streamheader with null buffer received"); GST_WARNING_OBJECT (vd, "streamheader with null buffer received");
result = GST_FLOW_ERROR; return GST_FLOW_NOT_NEGOTIATED;
goto done; }
buffer_error:
{
GST_WARNING_OBJECT (vd, "error handling buffer");
return GST_FLOW_NOT_NEGOTIATED;
} }
} }