diff options
| author | Olivier Crête <olivier.crete@ocrete.ca> | 2014-05-03 18:30:20 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@ocrete.ca> | 2014-05-03 18:30:20 -0400 |
| commit | 2e54d38dd04e313cc689371950ebc8c3ab37f674 (patch) | |
| tree | c6ac5e664bf06634873ff5cefae9af55ff805ca8 /gst/rtpmanager/rtpsource.h | |
| parent | 9ea8b03946a9787fefeaca7a462705d11bd12281 (diff) | |
rtpsession: Keep local conflicting addresses in the session
As we now replace the local RTPSource on a conflict, it's no longer possible
to keep local conflicts in the RTPSource, so they instead need to be kept
in the RTPSession.
Also fix the rtpcollision test to generate multiple collisions instead of
one by change the address, as otherwise we detected that it was a single one.
Diffstat (limited to 'gst/rtpmanager/rtpsource.h')
| -rw-r--r-- | gst/rtpmanager/rtpsource.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gst/rtpmanager/rtpsource.h b/gst/rtpmanager/rtpsource.h index 9af7d8ace..ed4adc9a9 100644 --- a/gst/rtpmanager/rtpsource.h +++ b/gst/rtpmanager/rtpsource.h @@ -266,9 +266,20 @@ void rtp_source_add_conflicting_address (RTPSource * src, GSocketAddress *address, GstClockTime time); +gboolean find_conflicting_address (GList * conflicting_address, + GSocketAddress * address, + GstClockTime time); + +GList * add_conflicting_address (GList * conflicting_addresses, + GSocketAddress * address, + GstClockTime time); +GList * timeout_conflicting_addresses (GList * conflicting_addresses, + GstClockTime current_time); + +void rtp_conflicting_address_free (RTPConflictingAddress * addr); + void rtp_source_timeout (RTPSource * src, GstClockTime current_time, - GstClockTime collision_timeout, GstClockTime feedback_retention_window); void rtp_source_retain_rtcp_packet (RTPSource * src, |