mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 13:11:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst: hamonise recent Caps function names with Structure counterparts

Browse source 
These functions were introduced as part of the GstIdStr MR:

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7432

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7644>
This commit is contained in:
François Laignel 2024-10-09 15:45:34 -04:00 committed by GStreamer Marge Bot
parent 5d995382f8
commit 375acaed51
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-base/gst-libs/gst/audio/audio-info.c
View file

@ -386,7 +386,7 @@ gst_audio_info_to_caps (const GstAudioInfo * info)
"but no channel positions present"); "but no channel positions present");
} }
caps = gst_caps_new_simple_static_str ("audio/x-raw", caps = gst_caps_new_static_str_simple ("audio/x-raw",
"format", G_TYPE_STRING, format, "format", G_TYPE_STRING, format,
"layout", G_TYPE_STRING, layout, "layout", G_TYPE_STRING, layout,
"rate", G_TYPE_INT, info->rate, "rate", G_TYPE_INT, info->rate,

2
subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudioaggregator.c
View file

@ -1070,7 +1070,7 @@ gst_audio_aggregator_sink_setcaps (GstAudioAggregatorPad * aaggpad,
/* Returns NULL if there is no downstream peer */ /* Returns NULL if there is no downstream peer */
if (downstream_caps) { if (downstream_caps) {
GstCaps *rate_caps = GstCaps *rate_caps =
gst_caps_new_simple_static_str ("audio/x-raw", "rate", G_TYPE_INT, gst_caps_new_static_str_simple ("audio/x-raw", "rate", G_TYPE_INT,
info.rate, info.rate,
NULL); NULL);

2
subprojects/gst-plugins-base/gst-libs/gst/video/video-info.c
View file

@ -678,7 +678,7 @@ gst_video_info_to_caps (const GstVideoInfo * info)
format = gst_video_format_to_string (info->finfo->format); format = gst_video_format_to_string (info->finfo->format);
g_return_val_if_fail (format != NULL, NULL); g_return_val_if_fail (format != NULL, NULL);
caps = gst_caps_new_simple_static_str ("video/x-raw", caps = gst_caps_new_static_str_simple ("video/x-raw",
"format", G_TYPE_STRING, format, "format", G_TYPE_STRING, format,
"width", G_TYPE_INT, info->width, "width", G_TYPE_INT, info->width,
"height", G_TYPE_INT, info->height, NULL); "height", G_TYPE_INT, info->height, NULL);

8
subprojects/gstreamer/gst/gstcaps.c
View file

@ -319,7 +319,7 @@ gst_caps_new_empty_simple (const char *media_type)
} }
/** /**
* gst_caps_new_empty_simple_static_str: * gst_caps_new_static_str_empty_simple:
* @media_type: the media type of the structure * @media_type: the media type of the structure
* *
* Creates a new #GstCaps that contains one #GstStructure with name * Creates a new #GstCaps that contains one #GstStructure with name
@ -333,7 +333,7 @@ gst_caps_new_empty_simple (const char *media_type)
* Since: 1.26 * Since: 1.26
*/ */
GstCaps * GstCaps *
gst_caps_new_empty_simple_static_str (const char *media_type) gst_caps_new_static_str_empty_simple (const char *media_type)
{ {
GstCaps *caps; GstCaps *caps;
GstStructure *structure; GstStructure *structure;
@ -390,7 +390,7 @@ gst_caps_new_simple (const char *media_type, const char *fieldname, ...)
} }
/** /**
* gst_caps_new_simple_static_str: * gst_caps_new_static_str_simple:
* @media_type: the media type of the structure * @media_type: the media type of the structure
* @fieldname: first field to set * @fieldname: first field to set
* @...: additional arguments * @...: additional arguments
@ -407,7 +407,7 @@ gst_caps_new_simple (const char *media_type, const char *fieldname, ...)
* Since: 1.26 * Since: 1.26
*/ */
GstCaps * GstCaps *
gst_caps_new_simple_static_str (const char *media_type, const char *fieldname, gst_caps_new_static_str_simple (const char *media_type, const char *fieldname,
...) ...)
{ {
GstCaps *caps; GstCaps *caps;

4
subprojects/gstreamer/gst/gstcaps.h
View file

@ -370,14 +370,14 @@ GST_API
GstCaps * gst_caps_new_empty_simple (const char *media_type) G_GNUC_WARN_UNUSED_RESULT; GstCaps * gst_caps_new_empty_simple (const char *media_type) G_GNUC_WARN_UNUSED_RESULT;
GST_API GST_API
GstCaps * gst_caps_new_empty_simple_static_str (const char *media_type) G_GNUC_WARN_UNUSED_RESULT; GstCaps * gst_caps_new_static_str_empty_simple (const char *media_type) G_GNUC_WARN_UNUSED_RESULT;
GST_API GST_API
GstCaps * gst_caps_new_simple (const char *media_type, GstCaps * gst_caps_new_simple (const char *media_type,
const char *fieldname, const char *fieldname,
...) G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT; ...) G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT;
GST_API GST_API
GstCaps * gst_caps_new_simple_static_str (const char *media_type, GstCaps * gst_caps_new_static_str_simple (const char *media_type,
const char *fieldname, const char *fieldname,
...) G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT; ...) G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT;
GST_API GST_API