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
cb7d3ba0
Commit
cb7d3ba0
authored
Nov 19, 2008
by
Olivier Crête
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Create a netbuffer directly instead of using gst_pad_buffer_alloc"
This reverts commit
c8cd93a9
.
parent
0671c485
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
14 deletions
+11
-14
configure.ac
configure.ac
+0
-1
gst/gstnicesrc.c
gst/gstnicesrc.c
+9
-12
gst/gstnicesrc.h
gst/gstnicesrc.h
+2
-1
No files found.
configure.ac
View file @
cb7d3ba0
...
...
@@ -82,7 +82,6 @@ AS_IF([test "$with_gstreamer" != no], [
PKG_CHECK_MODULES(GST, [
gstreamer-0.10 >= 0.10.0
gstreamer-base-0.10 >= 0.10.0
gstreamer-netbuffer-0.10 >= 0.10.0
],
[
with_gstreamer=yes
...
...
gst/gstnicesrc.c
View file @
cb7d3ba0
...
...
@@ -195,18 +195,15 @@ gst_nice_src_read_callback (NiceAgent *agent,
{
GstBaseSrc
*
basesrc
=
GST_BASE_SRC
(
data
);
GstNiceSrc
*
nicesrc
=
GST_NICE_SRC
(
basesrc
);
GstNetBuffer
*
mybuf
;
GST_LOG_OBJECT
(
agent
,
"Got buffer, getting out of the main loop"
);
mybuf
=
gst_netbuffer_new
();
GST_BUFFER_MALLOCDATA
(
mybuf
)
=
g_memdup
(
buf
,
len
);
GST_BUFFER_SIZE
(
mybuf
)
=
len
;
GST_BUFFER_DATA
(
mybuf
)
=
GST_BUFFER_MALLOCDATA
(
mybuf
);
if
(
GST_PAD_CAPS
(
basesrc
->
srcpad
))
GST_BUFFER_CAPS
(
mybuf
)
=
gst_caps_ref
(
GST_PAD_CAPS
(
basesrc
->
srcpad
));
nicesrc
->
outbuf
=
GST_BUFFER_CAST
(
mybuf
);
nicesrc
->
flow_ret
=
gst_pad_alloc_buffer
(
basesrc
->
srcpad
,
nicesrc
->
offset
,
len
,
GST_PAD_CAPS
(
basesrc
->
srcpad
),
&
nicesrc
->
outbuf
);
if
(
nicesrc
->
flow_ret
==
GST_FLOW_OK
)
{
memcpy
(
nicesrc
->
outbuf
->
data
,
buf
,
len
);
nicesrc
->
outbuf
->
size
=
len
;
}
g_main_loop_quit
(
nicesrc
->
mainloop
);
}
...
...
@@ -270,6 +267,7 @@ gst_nice_src_create (
GST_LOG_OBJECT
(
nicesrc
,
"create called"
);
nicesrc
->
outbuf
=
NULL
;
nicesrc
->
offset
=
offset
;
GST_OBJECT_LOCK
(
basesrc
);
if
(
nicesrc
->
unlocked
)
{
...
...
@@ -284,13 +282,12 @@ gst_nice_src_create (
GST_LOG_OBJECT
(
nicesrc
,
"Got buffer, pushing"
);
*
buffer
=
nicesrc
->
outbuf
;
GST_BUFFER_OFFSET
(
*
buffer
)
=
offset
;
return
GST_FLOW_OK
;
return
nicesrc
->
flow_ret
;
}
else
{
GST_LOG_OBJECT
(
nicesrc
,
"Got interrupting, returning wrong-state"
);
return
GST_FLOW_WRONG_STATE
;
}
}
static
void
...
...
gst/gstnicesrc.h
View file @
cb7d3ba0
...
...
@@ -40,7 +40,6 @@
#include <gst/gst.h>
#include <gst/base/gstbasesrc.h>
#include <gst/netbuffer/gstnetbuffer.h>
#include <nice/nice.h>
...
...
@@ -67,6 +66,8 @@ struct _GstNiceSrc
guint
stream_id
;
guint
component_id
;
GMainLoop
*
mainloop
;
guint64
offset
;
GstFlowReturn
flow_ret
;
GstBuffer
*
outbuf
;
gboolean
unlocked
;
GSource
*
idle_source
;
...
...
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