Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
gstreamer
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
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
luzpaz
gstreamer
Commits
2358938d
Commit
2358938d
authored
Nov 15, 2011
by
Wim Taymans
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
_accept_caps() -> _query_accept_caps()
parent
c55962c2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
13 deletions
+16
-13
docs/gst/gstreamer-sections.txt
docs/gst/gstreamer-sections.txt
+3
-4
gst/gstpad.c
gst/gstpad.c
+4
-4
gst/gstpad.h
gst/gstpad.h
+2
-2
libs/gst/base/gstbasetransform.c
libs/gst/base/gstbasetransform.c
+1
-1
plugins/elements/gstcapsfilter.c
plugins/elements/gstcapsfilter.c
+6
-2
No files found.
docs/gst/gstreamer-sections.txt
View file @
2358938d
...
...
@@ -1596,8 +1596,7 @@ gst_pad_get_pad_template_caps
gst_pad_set_caps
gst_pad_get_peer
gst_pad_peer_get_caps
gst_pad_peer_get_caps_reffed
gst_pad_peer_query_caps
gst_pad_use_fixed_caps
gst_pad_has_current_caps
...
...
@@ -1639,12 +1638,12 @@ GstPadLinkFunction
gst_pad_set_unlink_function
GstPadUnlinkFunction
gst_pad_accept_caps
gst_pad_
query_
accept_caps
gst_pad_proxy_query_caps
gst_pad_proxy_query_accept_caps
gst_pad_peer_accept_caps
gst_pad_peer_
query_
accept_caps
gst_pad_set_activate_function
GstPadActivateFunction
...
...
gst/gstpad.c
View file @
2358938d
...
...
@@ -2198,7 +2198,7 @@ gst_pad_peer_query_caps (GstPad * pad, GstCaps * filter)
}
/**
* gst_pad_accept_caps:
* gst_pad_
query_
accept_caps:
* @pad: a #GstPad to check
* @caps: a #GstCaps to check on the pad
*
...
...
@@ -2207,7 +2207,7 @@ gst_pad_peer_query_caps (GstPad * pad, GstCaps * filter)
* Returns: TRUE if the pad can accept the caps.
*/
gboolean
gst_pad_accept_caps
(
GstPad
*
pad
,
GstCaps
*
caps
)
gst_pad_
query_
accept_caps
(
GstPad
*
pad
,
GstCaps
*
caps
)
{
gboolean
res
=
TRUE
;
GstQuery
*
query
;
...
...
@@ -2228,7 +2228,7 @@ gst_pad_accept_caps (GstPad * pad, GstCaps * caps)
}
/**
* gst_pad_peer_accept_caps:
* gst_pad_peer_
query_
accept_caps:
* @pad: a #GstPad to check the peer of
* @caps: a #GstCaps to check on the pad
*
...
...
@@ -2238,7 +2238,7 @@ gst_pad_accept_caps (GstPad * pad, GstCaps * caps)
* Returns: TRUE if the peer of @pad can accept the caps or @pad has no peer.
*/
gboolean
gst_pad_peer_accept_caps
(
GstPad
*
pad
,
GstCaps
*
caps
)
gst_pad_peer_
query_
accept_caps
(
GstPad
*
pad
,
GstCaps
*
caps
)
{
gboolean
res
=
TRUE
;
GstQuery
*
query
;
...
...
gst/gstpad.h
View file @
2358938d
...
...
@@ -835,11 +835,11 @@ GstCaps* gst_pad_get_pad_template_caps (GstPad *pad);
GstCaps
*
gst_pad_get_current_caps
(
GstPad
*
pad
);
gboolean
gst_pad_has_current_caps
(
GstPad
*
pad
);
GstCaps
*
gst_pad_query_caps
(
GstPad
*
pad
,
GstCaps
*
filter
);
gboolean
gst_pad_accept_caps
(
GstPad
*
pad
,
GstCaps
*
caps
);
gboolean
gst_pad_
query_
accept_caps
(
GstPad
*
pad
,
GstCaps
*
caps
);
gboolean
gst_pad_set_caps
(
GstPad
*
pad
,
GstCaps
*
caps
);
GstCaps
*
gst_pad_peer_query_caps
(
GstPad
*
pad
,
GstCaps
*
filter
);
gboolean
gst_pad_peer_accept_caps
(
GstPad
*
pad
,
GstCaps
*
caps
);
gboolean
gst_pad_peer_
query_
accept_caps
(
GstPad
*
pad
,
GstCaps
*
caps
);
/* capsnego for linked pads */
GstCaps
*
gst_pad_get_allowed_caps
(
GstPad
*
pad
);
...
...
libs/gst/base/gstbasetransform.c
View file @
2358938d
...
...
@@ -1056,7 +1056,7 @@ gst_base_transform_find_transform (GstBaseTransform * trans, GstPad * pad,
goto
could_not_fixate
;
/* and peer should accept */
if
(
otherpeer
&&
!
gst_pad_accept_caps
(
otherpeer
,
othercaps
))
if
(
otherpeer
&&
!
gst_pad_
query_
accept_caps
(
otherpeer
,
othercaps
))
goto
peer_no_accept
;
GST_DEBUG_OBJECT
(
trans
,
"Input caps were %"
GST_PTR_FORMAT
...
...
plugins/elements/gstcapsfilter.c
View file @
2358938d
...
...
@@ -296,9 +296,13 @@ gst_capsfilter_accept_caps (GstBaseTransform * base,
if
(
ret
)
{
/* if we can intersect, see if the other end also accepts */
if
(
direction
==
GST_PAD_SRC
)
ret
=
gst_pad_peer_accept_caps
(
GST_BASE_TRANSFORM_SINK_PAD
(
base
),
caps
);
ret
=
gst_pad_peer_query_accept_caps
(
GST_BASE_TRANSFORM_SINK_PAD
(
base
),
caps
);
else
ret
=
gst_pad_peer_accept_caps
(
GST_BASE_TRANSFORM_SRC_PAD
(
base
),
caps
);
ret
=
gst_pad_peer_query_accept_caps
(
GST_BASE_TRANSFORM_SRC_PAD
(
base
),
caps
);
GST_DEBUG_OBJECT
(
capsfilter
,
"peer accept: %d"
,
ret
);
}
...
...
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