Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libnice
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
libnice
Commits
cbe7189a
Commit
cbe7189a
authored
Aug 04, 2008
by
Olivier Crête
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Save the to/from addresses and put them in newly created buffers
parent
c8cd93a9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
95 additions
and
3 deletions
+95
-3
gst/gstnicesrc.c
gst/gstnicesrc.c
+83
-0
gst/gstnicesrc.h
gst/gstnicesrc.h
+12
-3
No files found.
gst/gstnicesrc.c
View file @
cbe7189a
...
@@ -206,6 +206,9 @@ gst_nice_src_read_callback (NiceAgent *agent,
...
@@ -206,6 +206,9 @@ gst_nice_src_read_callback (NiceAgent *agent,
if
(
GST_PAD_CAPS
(
basesrc
->
srcpad
))
if
(
GST_PAD_CAPS
(
basesrc
->
srcpad
))
GST_BUFFER_CAPS
(
mybuf
)
=
gst_caps_ref
(
GST_PAD_CAPS
(
basesrc
->
srcpad
));
GST_BUFFER_CAPS
(
mybuf
)
=
gst_caps_ref
(
GST_PAD_CAPS
(
basesrc
->
srcpad
));
mybuf
->
from
=
nicesrc
->
from
;
mybuf
->
to
=
nicesrc
->
to
;
nicesrc
->
outbuf
=
GST_BUFFER_CAST
(
mybuf
);
nicesrc
->
outbuf
=
GST_BUFFER_CAST
(
mybuf
);
g_main_loop_quit
(
nicesrc
->
mainloop
);
g_main_loop_quit
(
nicesrc
->
mainloop
);
...
@@ -218,8 +221,10 @@ gst_nice_src_unlock_idler (gpointer data)
...
@@ -218,8 +221,10 @@ gst_nice_src_unlock_idler (gpointer data)
g_main_loop_quit
(
nicesrc
->
mainloop
);
g_main_loop_quit
(
nicesrc
->
mainloop
);
GST_OBJECT_LOCK
(
nicesrc
);
g_source_unref
(
nicesrc
->
idle_source
);
g_source_unref
(
nicesrc
->
idle_source
);
nicesrc
->
idle_source
=
NULL
;
nicesrc
->
idle_source
=
NULL
;
GST_OBJECT_UNLOCK
(
nicesrc
);
return
FALSE
;
return
FALSE
;
}
}
...
@@ -298,6 +303,10 @@ gst_nice_src_dispose (GObject *object)
...
@@ -298,6 +303,10 @@ gst_nice_src_dispose (GObject *object)
{
{
GstNiceSrc
*
src
=
GST_NICE_SRC
(
object
);
GstNiceSrc
*
src
=
GST_NICE_SRC
(
object
);
if
(
src
->
new_selected_pair_id
)
g_signal_handler_disconnect
(
src
->
agent
,
src
->
new_selected_pair_id
);
src
->
new_selected_pair_id
=
0
;
if
(
src
->
agent
)
if
(
src
->
agent
)
g_object_unref
(
src
->
agent
);
g_object_unref
(
src
->
agent
);
src
->
agent
=
NULL
;
src
->
agent
=
NULL
;
...
@@ -371,6 +380,69 @@ gst_nice_src_get_property (
...
@@ -371,6 +380,69 @@ gst_nice_src_get_property (
}
}
}
}
static
void
nice_address_to_gst_net_address
(
NiceAddress
*
niceaddr
,
GstNetAddress
*
gstaddr
)
{
switch
(
niceaddr
->
s
.
addr
.
sa_family
)
{
case
AF_INET
:
gst_netaddress_set_ip4_address
(
gstaddr
,
niceaddr
->
s
.
ip4
.
sin_addr
.
s_addr
,
niceaddr
->
s
.
ip4
.
sin_port
);
break
;
case
AF_INET6
:
gst_netaddress_set_ip6_address
(
gstaddr
,
niceaddr
->
s
.
ip6
.
sin6_addr
.
s6_addr
,
niceaddr
->
s
.
ip6
.
sin6_port
);
break
;
default:
break
;
}
}
static
void
new_selected_pair_cb
(
NiceAgent
*
agent
,
guint
stream_id
,
guint
component_id
,
gchar
*
local_cand
,
gchar
*
remote_cand
,
GstNiceSrc
*
src
)
{
GST_OBJECT_LOCK
(
src
);
if
(
stream_id
==
src
->
stream_id
&&
component_id
==
src
->
component_id
)
{
GSList
*
local_candidates
=
nice_agent_get_local_candidates
(
src
->
agent
,
stream_id
,
component_id
);
GSList
*
remote_candidates
=
nice_agent_get_remote_candidates
(
src
->
agent
,
stream_id
,
component_id
);
GSList
*
item
=
NULL
;
for
(
item
=
local_candidates
;
item
;
item
=
g_slist_next
(
item
))
{
NiceCandidate
*
cand
=
item
->
data
;
if
(
!
strcmp
(
local_cand
,
cand
->
foundation
))
{
nice_address_to_gst_net_address
(
&
cand
->
addr
,
&
src
->
to
);
break
;
}
}
for
(
item
=
remote_candidates
;
item
;
item
=
g_slist_next
(
item
))
{
NiceCandidate
*
cand
=
item
->
data
;
if
(
!
strcmp
(
remote_cand
,
cand
->
foundation
))
{
nice_address_to_gst_net_address
(
&
cand
->
addr
,
&
src
->
from
);
break
;
}
}
g_slist_foreach
(
local_candidates
,
(
GFunc
)
nice_candidate_free
,
NULL
);
g_slist_free
(
local_candidates
);
g_slist_foreach
(
remote_candidates
,
(
GFunc
)
nice_candidate_free
,
NULL
);
g_slist_free
(
remote_candidates
);
}
GST_OBJECT_UNLOCK
(
src
);
}
static
GstStateChangeReturn
static
GstStateChangeReturn
gst_nice_src_change_state
(
GstElement
*
element
,
GstStateChange
transition
)
gst_nice_src_change_state
(
GstElement
*
element
,
GstStateChange
transition
)
{
{
...
@@ -389,14 +461,25 @@ gst_nice_src_change_state (GstElement * element, GstStateChange transition)
...
@@ -389,14 +461,25 @@ gst_nice_src_change_state (GstElement * element, GstStateChange transition)
}
}
else
else
{
{
GST_OBJECT_LOCK
(
src
);
nice_agent_attach_recv
(
src
->
agent
,
src
->
stream_id
,
src
->
component_id
,
nice_agent_attach_recv
(
src
->
agent
,
src
->
stream_id
,
src
->
component_id
,
g_main_loop_get_context
(
src
->
mainloop
),
g_main_loop_get_context
(
src
->
mainloop
),
gst_nice_src_read_callback
,
(
gpointer
)
src
);
gst_nice_src_read_callback
,
(
gpointer
)
src
);
if
(
!
src
->
new_selected_pair_id
)
src
->
new_selected_pair_id
=
g_signal_connect
(
src
->
agent
,
"new-selected-pair"
,
G_CALLBACK
(
new_selected_pair_cb
),
src
);
GST_OBJECT_UNLOCK
(
src
);
}
}
break
;
break
;
case
GST_STATE_CHANGE_READY_TO_NULL
:
case
GST_STATE_CHANGE_READY_TO_NULL
:
GST_OBJECT_LOCK
(
src
);
nice_agent_attach_recv
(
src
->
agent
,
src
->
stream_id
,
src
->
component_id
,
nice_agent_attach_recv
(
src
->
agent
,
src
->
stream_id
,
src
->
component_id
,
g_main_loop_get_context
(
src
->
mainloop
),
NULL
,
NULL
);
g_main_loop_get_context
(
src
->
mainloop
),
NULL
,
NULL
);
if
(
src
->
new_selected_pair_id
)
g_signal_handler_disconnect
(
src
->
agent
,
src
->
new_selected_pair_id
);
src
->
new_selected_pair_id
=
0
;
GST_OBJECT_UNLOCK
(
src
);
break
;
break
;
default:
default:
break
;
break
;
...
...
gst/gstnicesrc.h
View file @
cbe7189a
...
@@ -63,13 +63,22 @@ struct _GstNiceSrc
...
@@ -63,13 +63,22 @@ struct _GstNiceSrc
{
{
GstBaseSrc
parent
;
GstBaseSrc
parent
;
GstPad
*
srcpad
;
GstPad
*
srcpad
;
GMainLoop
*
mainloop
;
/* Protected by the object lock */
gboolean
unlocked
;
GSource
*
idle_source
;
NiceAgent
*
agent
;
NiceAgent
*
agent
;
guint
stream_id
;
guint
stream_id
;
guint
component_id
;
guint
component_id
;
GMainLoop
*
mainloop
;
/* Protected by the stream lock */
GstBuffer
*
outbuf
;
GstBuffer
*
outbuf
;
gboolean
unlocked
;
GSource
*
idle_source
;
/* Protected by the object lock */
gulong
new_selected_pair_id
;
GstNetAddress
from
;
GstNetAddress
to
;
};
};
typedef
struct
_GstNiceSrcClass
GstNiceSrcClass
;
typedef
struct
_GstNiceSrcClass
GstNiceSrcClass
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment