mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-13 09:45:27 +00:00
Code Issues 1 Projects Releases Wiki Activity

[MOVED FROM GST-P-FARSIGHT] Cleaned up the code a bit, no use of GST_* and return value verification from gst_*

Browse source 
20070828171546-4f0f6-bdeb4b1b7f99f9464aabe5c43bd4a4d2025262b6.gz
This commit is contained in:
Youness Alaoui 2007-08-28 17:15:46 +00:00 committed by Edward Hervey
parent a8e4a3007e
commit 681dc405d5
2 changed files with 55 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
gst/dtmf/gstdtmfsrc.c
View file

@ -402,8 +402,11 @@ gst_dtmf_src_handle_custom_upstream (GstDTMFSrc *dtmfsrc,
{ {
gboolean result = FALSE; gboolean result = FALSE;
const GstStructure *structure; const GstStructure *structure;
GstState state;
GstStateChangeReturn ret;
if (GST_STATE (dtmfsrc) != GST_STATE_PLAYING) { ret = gst_element_get_state (dtmfsrc, &state, NULL, 0);
if (ret != GST_STATE_CHANGE_SUCCESS || state != GST_STATE_PLAYING) {
GST_DEBUG_OBJECT (dtmfsrc, "Received event while not in PLAYING state"); GST_DEBUG_OBJECT (dtmfsrc, "Received event while not in PLAYING state");
goto ret; goto ret;
} }
@ -422,8 +425,8 @@ gst_dtmf_src_handle_event (GstPad * pad, GstEvent * event)
{ {
GstDTMFSrc *dtmfsrc; GstDTMFSrc *dtmfsrc;
gboolean result = FALSE; gboolean result = FALSE;
GstElement *parent = gst_pad_get_parent_element (pad);
dtmfsrc = GST_DTMF_SRC (GST_PAD_PARENT (pad)); dtmfsrc = GST_DTMF_SRC (parent);
GST_DEBUG_OBJECT (dtmfsrc, "Received an event on the src pad"); GST_DEBUG_OBJECT (dtmfsrc, "Received an event on the src pad");
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
@ -439,7 +442,7 @@ gst_dtmf_src_handle_event (GstPad * pad, GstEvent * event)
result = TRUE; result = TRUE;
break; break;
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
gst_segment_init (&dtmfsrc->segment, GST_FORMAT_UNDEFINED); gst_segment_init (&dtmfsrc->segment, GST_FORMAT_TIME);
break; break;
case GST_EVENT_NEWSEGMENT: case GST_EVENT_NEWSEGMENT:
{ {
@ -459,6 +462,7 @@ gst_dtmf_src_handle_event (GstPad * pad, GstEvent * event)
break; break;
} }
gst_object_unref (parent);
gst_event_unref (event); gst_event_unref (event);
return result; return result;
} }
@ -509,7 +513,9 @@ gst_dtmf_src_set_stream_lock (GstDTMFSrc *dtmfsrc, gboolean lock)
"lock", G_TYPE_BOOLEAN, lock, NULL); "lock", G_TYPE_BOOLEAN, lock, NULL);
event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM_OOB, structure); event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM_OOB, structure);
gst_pad_push_event (dtmfsrc->srcpad, event); if (!gst_pad_push_event (dtmfsrc->srcpad, event)) {
GST_WARNING_OBJECT (dtmfsrc, "stream-lock event not handled");
}
} }
static void static void
@ -517,14 +523,15 @@ gst_dtmf_prepare_timestamps (GstDTMFSrc *dtmfsrc)
{ {
GstClock *clock; GstClock *clock;
clock = GST_ELEMENT_CLOCK (dtmfsrc); clock = gst_element_get_clock (dtmfsrc);
if (clock != NULL) if (clock != NULL) {
dtmfsrc->timestamp = gst_clock_get_time (GST_ELEMENT_CLOCK (dtmfsrc)); dtmfsrc->timestamp = gst_clock_get_time (clock);
gst_object_unref (clock);
else { } else {
GST_ERROR_OBJECT (dtmfsrc, "No clock set for element %s", gchar *dtmf_name = gst_element_get_name (dtmfsrc);
GST_ELEMENT_NAME (dtmfsrc)); GST_ERROR_OBJECT (dtmfsrc, "No clock set for element %s", dtmf_name);
dtmfsrc->timestamp = GST_CLOCK_TIME_NONE; dtmfsrc->timestamp = GST_CLOCK_TIME_NONE;
g_free (dtmf_name);
} }
} }
@ -665,7 +672,7 @@ gst_dtmf_src_wait_for_buffer_ts (GstDTMFSrc *dtmfsrc, GstBuffer * buf)
{ {
GstClock *clock; GstClock *clock;
clock = GST_ELEMENT_CLOCK (dtmfsrc); clock = gst_element_get_clock (dtmfsrc);
if (clock != NULL) { if (clock != NULL) {
GstClockID clock_id; GstClockID clock_id;
GstClockReturn clock_ret; GstClockReturn clock_ret;
@ -673,15 +680,18 @@ gst_dtmf_src_wait_for_buffer_ts (GstDTMFSrc *dtmfsrc, GstBuffer * buf)
clock_id = gst_clock_new_single_shot_id (clock, GST_BUFFER_TIMESTAMP (buf)); clock_id = gst_clock_new_single_shot_id (clock, GST_BUFFER_TIMESTAMP (buf));
clock_ret = gst_clock_id_wait (clock_id, NULL); clock_ret = gst_clock_id_wait (clock_id, NULL);
if (clock_ret != GST_CLOCK_OK && clock_ret != GST_CLOCK_EARLY) { if (clock_ret != GST_CLOCK_OK && clock_ret != GST_CLOCK_EARLY) {
GST_ERROR_OBJECT (dtmfsrc, "Failed to wait on clock %s", gchar *clock_name = gst_element_get_name (clock);
GST_ELEMENT_NAME (clock)); GST_ERROR_OBJECT (dtmfsrc, "Failed to wait on clock %s", clock_name);
g_free (clock_name);
} }
gst_clock_id_unref (clock_id); gst_clock_id_unref (clock_id);
gst_object_unref (clock);
} }
else { else {
GST_ERROR_OBJECT (dtmfsrc, "No clock set for element %s", gchar *dtmf_name = gst_element_get_name (dtmfsrc);
GST_ELEMENT_NAME (dtmfsrc)); GST_ERROR_OBJECT (dtmfsrc, "No clock set for element %s", dtmf_name);
g_free (dtmf_name);
} }
} }

43
gst/dtmf/gstrtpdtmfsrc.c
View file

@ -412,7 +412,11 @@ gst_rtp_dtmf_src_handle_custom_upstream (GstRTPDTMFSrc *dtmfsrc,
gchar *struct_str; gchar *struct_str;
const GstStructure *structure; const GstStructure *structure;
if (GST_STATE (dtmfsrc) != GST_STATE_PLAYING) { GstState state;
GstStateChangeReturn ret;
ret = gst_element_get_state (dtmfsrc, &state, NULL, 0);
if (ret != GST_STATE_CHANGE_SUCCESS || state != GST_STATE_PLAYING) {
GST_DEBUG_OBJECT (dtmfsrc, "Received event while not in PLAYING state"); GST_DEBUG_OBJECT (dtmfsrc, "Received event while not in PLAYING state");
goto ret; goto ret;
} }
@ -434,8 +438,9 @@ gst_rtp_dtmf_src_handle_event (GstPad * pad, GstEvent * event)
{ {
GstRTPDTMFSrc *dtmfsrc; GstRTPDTMFSrc *dtmfsrc;
gboolean result = FALSE; gboolean result = FALSE;
GstElement *parent = gst_pad_get_parent_element (pad);
dtmfsrc = GST_DTMF_SRC (parent);
dtmfsrc = GST_RTP_DTMF_SRC (GST_PAD_PARENT (pad));
GST_DEBUG_OBJECT (dtmfsrc, "Received an event on the src pad"); GST_DEBUG_OBJECT (dtmfsrc, "Received an event on the src pad");
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
@ -471,6 +476,7 @@ gst_rtp_dtmf_src_handle_event (GstPad * pad, GstEvent * event)
break; break;
} }
gst_object_unref (parent);
gst_event_unref (event); gst_event_unref (event);
return result; return result;
} }
@ -565,7 +571,10 @@ gst_rtp_dtmf_src_set_stream_lock (GstRTPDTMFSrc *dtmfsrc, gboolean lock)
"lock", G_TYPE_BOOLEAN, lock, NULL); "lock", G_TYPE_BOOLEAN, lock, NULL);
event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM_OOB, structure); event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM_OOB, structure);
gst_pad_push_event (dtmfsrc->srcpad, event); if (!gst_pad_push_event (dtmfsrc->srcpad, event)) {
GST_WARNING_OBJECT (dtmfsrc, "stream-lock event not handled");
}
} }
static void static void
@ -573,15 +582,16 @@ gst_rtp_dtmf_prepare_timestamps (GstRTPDTMFSrc *dtmfsrc)
{ {
GstClock *clock; GstClock *clock;
clock = GST_ELEMENT_CLOCK (dtmfsrc); clock = gst_element_get_clock (dtmfsrc);
if (clock != NULL) if (clock != NULL) {
dtmfsrc->timestamp = gst_clock_get_time (GST_ELEMENT_CLOCK (dtmfsrc)) dtmfsrc->timestamp = gst_clock_get_time (clock)
+ (MIN_INTER_DIGIT_INTERVAL * GST_MSECOND); + (MIN_INTER_DIGIT_INTERVAL * GST_MSECOND);
gst_object_unref (clock);
else { } else {
GST_ERROR_OBJECT (dtmfsrc, "No clock set for element %s", gchar *dtmf_name = gst_element_get_name (dtmfsrc);
GST_ELEMENT_NAME (dtmfsrc)); GST_ERROR_OBJECT (dtmfsrc, "No clock set for element %s", dtmf_name);
dtmfsrc->timestamp = GST_CLOCK_TIME_NONE; dtmfsrc->timestamp = GST_CLOCK_TIME_NONE;
g_free (dtmf_name);
} }
dtmfsrc->rtp_timestamp = dtmfsrc->ts_base + dtmfsrc->rtp_timestamp = dtmfsrc->ts_base +
@ -664,7 +674,7 @@ gst_rtp_dtmf_src_wait_for_buffer_ts (GstRTPDTMFSrc *dtmfsrc, GstBuffer * buf)
{ {
GstClock *clock; GstClock *clock;
clock = GST_ELEMENT_CLOCK (dtmfsrc); clock = gst_element_get_clock (dtmfsrc);
if (clock != NULL) { if (clock != NULL) {
GstClockID clock_id; GstClockID clock_id;
GstClockReturn clock_ret; GstClockReturn clock_ret;
@ -672,15 +682,18 @@ gst_rtp_dtmf_src_wait_for_buffer_ts (GstRTPDTMFSrc *dtmfsrc, GstBuffer * buf)
clock_id = gst_clock_new_single_shot_id (clock, GST_BUFFER_TIMESTAMP (buf)); clock_id = gst_clock_new_single_shot_id (clock, GST_BUFFER_TIMESTAMP (buf));
clock_ret = gst_clock_id_wait (clock_id, NULL); clock_ret = gst_clock_id_wait (clock_id, NULL);
if (clock_ret != GST_CLOCK_OK && clock_ret != GST_CLOCK_EARLY) { if (clock_ret != GST_CLOCK_OK && clock_ret != GST_CLOCK_EARLY) {
GST_ERROR_OBJECT (dtmfsrc, "Failed to wait on clock %s", gchar *clock_name = gst_element_get_name (clock);
GST_ELEMENT_NAME (clock)); GST_ERROR_OBJECT (dtmfsrc, "Failed to wait on clock %s", clock_name);
g_free (clock_name);
} }
gst_clock_id_unref (clock_id); gst_clock_id_unref (clock_id);
gst_object_unref (clock);
} }
else { else {
GST_ERROR_OBJECT (dtmfsrc, "No clock set for element %s", gchar *dtmf_name = gst_element_get_name (dtmfsrc);
GST_ELEMENT_NAME (dtmfsrc)); GST_ERROR_OBJECT (dtmfsrc, "No clock set for element %s", dtmf_name);
g_free (dtmf_name);
} }
} }