mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/sidplay/gstsiddec.cc: Small fixes and more error messages.

Browse source 
Original commit message from CVS:
* ext/sidplay/gstsiddec.cc:
Small fixes and more error messages.
This commit is contained in:
Wim Taymans 2005-10-20 08:30:33 +00:00
parent dcd58b7551
commit 583fa9bf82
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2005-10-20 Wim Taymans <wim@fluendo.com>
* ext/sidplay/gstsiddec.cc:
Small fixes and more error messages.
2005-10-19 Wim Taymans <wim@fluendo.com> 2005-10-19 Wim Taymans <wim@fluendo.com>
* ext/amrnb/amrnbparse.c: (gst_amrnbparse_query), * ext/amrnb/amrnbparse.c: (gst_amrnbparse_query),

20
ext/sidplay/gstsiddec.cc
View file

@ -320,8 +320,11 @@ siddec_negotiate (GstSidDec * siddec)
int channels = 2; int channels = 2;
allowed = gst_pad_get_allowed_caps (siddec->srcpad); allowed = gst_pad_get_allowed_caps (siddec->srcpad);
if (!allowed) if (!allowed) {
GST_DEBUG_OBJECT (siddec, "could not get allowed caps");
return FALSE; return FALSE;
}
GST_DEBUG_OBJECT (siddec, "allowed caps: " GST_PTR_FORMAT, allowed);
structure = gst_caps_get_structure (allowed, 0); structure = gst_caps_get_structure (allowed, 0);
@ -329,6 +332,8 @@ siddec_negotiate (GstSidDec * siddec)
gst_structure_get_int (structure, "depth", &depth); gst_structure_get_int (structure, "depth", &depth);
if (width && depth && width != depth) { if (width && depth && width != depth) {
GST_DEBUG_OBJECT (siddec, "width %d and depth %d are different",
width, depth);
return FALSE; return FALSE;
} }
width = width | depth; width = width | depth;
@ -384,6 +389,7 @@ play_loop (GstPad * pad)
GST_BUFFER_OFFSET (out) = offset; GST_BUFFER_OFFSET (out) = offset;
/* get current timestamp */ /* get current timestamp */
format = GST_FORMAT_TIME;
gst_siddec_src_convert (siddec->srcpad, gst_siddec_src_convert (siddec->srcpad,
GST_FORMAT_BYTES, siddec->total_bytes, &format, &time); GST_FORMAT_BYTES, siddec->total_bytes, &format, &time);
GST_BUFFER_TIMESTAMP (out) = time; GST_BUFFER_TIMESTAMP (out) = time;
@ -430,6 +436,9 @@ start_play_tune (GstSidDec * siddec)
siddec->tune_number)) siddec->tune_number))
goto could_not_init; goto could_not_init;
gst_pad_push_event (siddec->srcpad,
gst_event_new_newsegment (FALSE, 1.0, GST_FORMAT_TIME, 0, -1, 0));
res = gst_pad_start_task (siddec->srcpad, res = gst_pad_start_task (siddec->srcpad,
(GstTaskFunction) play_loop, siddec->srcpad); (GstTaskFunction) play_loop, siddec->srcpad);
return res; return res;
@ -437,17 +446,20 @@ start_play_tune (GstSidDec * siddec)
/* ERRORS */ /* ERRORS */
could_not_load: could_not_load:
{ {
GST_ELEMENT_ERROR (siddec, LIBRARY, TOO_LAZY, (NULL), (NULL)); GST_ELEMENT_ERROR (siddec, LIBRARY, INIT,
("Could not load tune"), ("Could not load tune"));
return FALSE; return FALSE;
} }
could_not_negotiate: could_not_negotiate:
{ {
GST_ELEMENT_ERROR (siddec, CORE, NEGOTIATION, (NULL), (NULL)); GST_ELEMENT_ERROR (siddec, CORE, NEGOTIATION,
("Could not negotiate format"), ("Could not negotiate format"));
return FALSE; return FALSE;
} }
could_not_init: could_not_init:
{ {
GST_ELEMENT_ERROR (siddec, LIBRARY, TOO_LAZY, (NULL), (NULL)); GST_ELEMENT_ERROR (siddec, LIBRARY, INIT,
("Could not initialize song"), ("Could not initialize song"));
return FALSE; return FALSE;
} }
} }