mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-26 17:18:15 +00:00
Rename gst_caps_structure_fixate_* to gst_structure_fixate_* (#322027)
Original commit message from CVS: * ext/audioresample/gstaudioresample.c: * ext/polyp/polypsink.c: (gst_polypsink_sink_fixate): * gst/librfb/gstrfbsrc.c: (gst_rfbsrc_fixate): * gst/modplug/gstmodplug.cc: * sys/glsink/glimagesink.c: (gst_glimagesink_fixate): * sys/v4l2/gstv4l2src.c: (gst_v4l2src_fixate): Rename gst_caps_structure_fixate_* to gst_structure_fixate_* (#322027)
This commit is contained in:
parent
7f1b45229f
commit
8a7c7d077f
7 changed files with 24 additions and 17 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
|||
2005-11-21 Jan Schmidt <thaytan@mad.scientist.com>
|
||||
|
||||
* ext/audioresample/gstaudioresample.c:
|
||||
* ext/polyp/polypsink.c: (gst_polypsink_sink_fixate):
|
||||
* gst/librfb/gstrfbsrc.c: (gst_rfbsrc_fixate):
|
||||
* gst/modplug/gstmodplug.cc:
|
||||
* sys/glsink/glimagesink.c: (gst_glimagesink_fixate):
|
||||
* sys/v4l2/gstv4l2src.c: (gst_v4l2src_fixate):
|
||||
Rename gst_caps_structure_fixate_* to gst_structure_fixate_*
|
||||
(#322027)
|
||||
|
||||
2005-11-21 Edgard Lima <edgard.lima@indt.org.br>
|
||||
|
||||
* ext/Makefile.am:
|
||||
|
|
|
@ -212,7 +212,7 @@ static GstCaps *gst_audioresample_fixate (GstPad * pad, const GstCaps * caps)
|
|||
copy = gst_caps_copy (caps);
|
||||
structure = gst_caps_get_structure (copy, 0);
|
||||
if (rate) {
|
||||
if (gst_caps_structure_fixate_field_nearest_int (structure, "rate", rate)) {
|
||||
if (gst_structure_fixate_field_nearest_int (structure, "rate", rate)) {
|
||||
return copy;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -575,10 +575,10 @@ gst_polypsink_sink_fixate (GstPad * pad, const GstCaps * caps)
|
|||
NULL);
|
||||
structure = gst_caps_get_structure (newcaps, 0);
|
||||
|
||||
if (gst_caps_structure_fixate_field_nearest_int (structure, "rate", 44100) ||
|
||||
gst_caps_structure_fixate_field_nearest_int (structure, "depth", 16) ||
|
||||
gst_caps_structure_fixate_field_nearest_int (structure, "width", 16) ||
|
||||
gst_caps_structure_fixate_field_nearest_int (structure, "channels", 2))
|
||||
if (gst_structure_fixate_field_nearest_int (structure, "rate", 44100) ||
|
||||
gst_structure_fixate_field_nearest_int (structure, "depth", 16) ||
|
||||
gst_structure_fixate_field_nearest_int (structure, "width", 16) ||
|
||||
gst_structure_fixate_field_nearest_int (structure, "channels", 2))
|
||||
return newcaps;
|
||||
|
||||
gst_caps_free (newcaps);
|
||||
|
|
|
@ -292,8 +292,7 @@ gst_rfbsrc_fixate (GstPad * pad, const GstCaps * caps)
|
|||
newcaps = gst_caps_copy (caps);
|
||||
structure = gst_caps_get_structure (newcaps, 0);
|
||||
|
||||
if (gst_caps_structure_fixate_field_nearest_double (structure, "framerate",
|
||||
30.0)) {
|
||||
if (gst_structure_fixate_field_nearest_double (structure, "framerate", 30.0)) {
|
||||
return newcaps;
|
||||
}
|
||||
|
||||
|
|
|
@ -480,9 +480,9 @@ gst_modplug_fixate (GstPad * pad, const GstCaps * caps)
|
|||
|
||||
copy = gst_caps_copy (caps);
|
||||
structure = gst_caps_get_structure (copy, 0);
|
||||
if (gst_caps_structure_fixate_field_nearest_int (structure, "rate", 44100))
|
||||
if (gst_structure_fixate_field_nearest_int (structure, "rate", 44100))
|
||||
return copy;
|
||||
if (gst_caps_structure_fixate_field_nearest_int (structure, "channels", 2))
|
||||
if (gst_structure_fixate_field_nearest_int (structure, "channels", 2))
|
||||
return copy;
|
||||
gst_caps_free (copy);
|
||||
}
|
||||
|
|
|
@ -840,14 +840,13 @@ gst_glimagesink_fixate (GstPad * pad, const GstCaps * caps)
|
|||
newcaps = gst_caps_copy (caps);
|
||||
structure = gst_caps_get_structure (newcaps, 0);
|
||||
|
||||
if (gst_caps_structure_fixate_field_nearest_int (structure, "width", 320)) {
|
||||
if (gst_structure_fixate_field_nearest_int (structure, "width", 320)) {
|
||||
return newcaps;
|
||||
}
|
||||
if (gst_caps_structure_fixate_field_nearest_int (structure, "height", 240)) {
|
||||
if (gst_structure_fixate_field_nearest_int (structure, "height", 240)) {
|
||||
return newcaps;
|
||||
}
|
||||
if (gst_caps_structure_fixate_field_nearest_double (structure, "framerate",
|
||||
30.0)) {
|
||||
if (gst_structure_fixate_field_nearest_double (structure, "framerate", 30.0)) {
|
||||
return newcaps;
|
||||
}
|
||||
|
||||
|
|
|
@ -690,8 +690,7 @@ gst_v4l2src_fixate (GstPad * pad, const GstCaps * const_caps)
|
|||
for (i = 0; i < gst_caps_get_size (caps); i++) {
|
||||
structure = gst_caps_get_structure (caps, i);
|
||||
changed |=
|
||||
gst_caps_structure_fixate_field_nearest_int (structure, "width",
|
||||
G_MAXINT);
|
||||
gst_structure_fixate_field_nearest_int (structure, "width", G_MAXINT);
|
||||
}
|
||||
if (changed)
|
||||
return caps;
|
||||
|
@ -699,8 +698,7 @@ gst_v4l2src_fixate (GstPad * pad, const GstCaps * const_caps)
|
|||
for (i = 0; i < gst_caps_get_size (caps); i++) {
|
||||
structure = gst_caps_get_structure (caps, i);
|
||||
changed |=
|
||||
gst_caps_structure_fixate_field_nearest_int (structure, "height",
|
||||
G_MAXINT);
|
||||
gst_structure_fixate_field_nearest_int (structure, "height", G_MAXINT);
|
||||
}
|
||||
if (changed)
|
||||
return caps;
|
||||
|
|
Loading…
Reference in a new issue