projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5073948
)
baseparse: rename _set_frame_props() to _set_frame_rate()
author
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Fri, 8 Apr 2011 14:31:14 +0000
(15:31 +0100)
committer
Tim-Philipp Müller
<tim.muller@collabora.co.uk>
Fri, 8 Apr 2011 14:44:58 +0000
(15:44 +0100)
Seems like the best fit to what it does, and is shorter than
set_frame_properties() which might also have been confusing
because of GstBaseParseFrame.
https://bugzilla.gnome.org/show_bug.cgi?id=518857
docs/libs/gstreamer-libs-sections.txt
patch
|
blob
|
history
docs/plugins/gstreamer-plugins.args
patch
|
blob
|
history
libs/gst/base/gstbaseparse.c
patch
|
blob
|
history
libs/gst/base/gstbaseparse.h
patch
|
blob
|
history
win32/common/libgstbase.def
patch
|
blob
|
history
diff --git
a/docs/libs/gstreamer-libs-sections.txt
b/docs/libs/gstreamer-libs-sections.txt
index
e6bf397
..
19f04d5
100644
(file)
--- a/
docs/libs/gstreamer-libs-sections.txt
+++ b/
docs/libs/gstreamer-libs-sections.txt
@@
-235,7
+235,7
@@
gst_base_parse_set_min_frame_size
gst_base_parse_set_passthrough
gst_base_parse_set_syncable
gst_base_parse_set_has_timing_info
gst_base_parse_set_passthrough
gst_base_parse_set_syncable
gst_base_parse_set_has_timing_info
-gst_base_parse_set_frame_
props
+gst_base_parse_set_frame_
rate
gst_base_parse_convert_default
gst_base_parse_add_index_entry
gst_base_parse_convert_default
gst_base_parse_add_index_entry
diff --git
a/docs/plugins/gstreamer-plugins.args
b/docs/plugins/gstreamer-plugins.args
index
9fa076b
..
507789f
100644
(file)
--- a/
docs/plugins/gstreamer-plugins.args
+++ b/
docs/plugins/gstreamer-plugins.args
@@
-991,7
+991,7
@@
<ARG>
<NAME>GstQueue2::ring-buffer-max-size</NAME>
<TYPE>guint64</TYPE>
<ARG>
<NAME>GstQueue2::ring-buffer-max-size</NAME>
<TYPE>guint64</TYPE>
-<RANGE><
= G_MAXUINT<
/RANGE>
+<RANGE></RANGE>
<FLAGS>rw</FLAGS>
<NICK>Max. ring buffer size (bytes)</NICK>
<BLURB>Max. amount of data in the ring buffer (bytes, 0 = disabled.</BLURB>
<FLAGS>rw</FLAGS>
<NICK>Max. ring buffer size (bytes)</NICK>
<BLURB>Max. amount of data in the ring buffer (bytes, 0 = disabled.</BLURB>
diff --git
a/libs/gst/base/gstbaseparse.c
b/libs/gst/base/gstbaseparse.c
index
5916950
..
5c6d128
100644
(file)
--- a/
libs/gst/base/gstbaseparse.c
+++ b/
libs/gst/base/gstbaseparse.c
@@
-165,7
+165,7
@@
* </para></listitem>
* <listitem><para>
* Configure various baseparse parameters using @gst_base_parse_set_seek and
* </para></listitem>
* <listitem><para>
* Configure various baseparse parameters using @gst_base_parse_set_seek and
- * @gst_base_parse_set_frame_
props
.
+ * @gst_base_parse_set_frame_
rate
.
* </para></listitem>
* <listitem><para>
* In particular, if subclass is unable to determine a duration, but
* </para></listitem>
* <listitem><para>
* In particular, if subclass is unable to determine a duration, but
@@
-2818,7
+2818,7
@@
gst_base_parse_set_min_frame_size (GstBaseParse * parse, guint min_size)
}
/**
}
/**
- * gst_base_parse_set_frame_
props
:
+ * gst_base_parse_set_frame_
rate
:
* @parse: the #GstBaseParse to set
* @fps_num: frames per second (numerator).
* @fps_den: frames per second (denominator).
* @parse: the #GstBaseParse to set
* @fps_num: frames per second (numerator).
* @fps_den: frames per second (denominator).
@@
-2834,7
+2834,7
@@
gst_base_parse_set_min_frame_size (GstBaseParse * parse, guint min_size)
* Since: 0.10.33
*/
void
* Since: 0.10.33
*/
void
-gst_base_parse_set_frame_
props
(GstBaseParse * parse, guint fps_num,
+gst_base_parse_set_frame_
rate
(GstBaseParse * parse, guint fps_num,
guint fps_den, guint lead_in, guint lead_out)
{
g_return_if_fail (parse != NULL);
guint fps_den, guint lead_in, guint lead_out)
{
g_return_if_fail (parse != NULL);
diff --git
a/libs/gst/base/gstbaseparse.h
b/libs/gst/base/gstbaseparse.h
index
c613cc6
..
ca42fee
100644
(file)
--- a/
libs/gst/base/gstbaseparse.h
+++ b/
libs/gst/base/gstbaseparse.h
@@
-283,7
+283,7
@@
void gst_base_parse_set_syncable (GstBaseParse * parse,
void gst_base_parse_set_passthrough (GstBaseParse * parse,
gboolean passthrough);
void gst_base_parse_set_passthrough (GstBaseParse * parse,
gboolean passthrough);
-void gst_base_parse_set_frame_
props
(GstBaseParse * parse,
+void gst_base_parse_set_frame_
rate
(GstBaseParse * parse,
guint fps_num,
guint fps_den,
guint lead_in,
guint fps_num,
guint fps_den,
guint lead_in,
diff --git
a/win32/common/libgstbase.def
b/win32/common/libgstbase.def
index
cccb58b
..
7f6a83c
100644
(file)
--- a/
win32/common/libgstbase.def
+++ b/
win32/common/libgstbase.def
@@
-14,6
+14,18
@@
EXPORTS
gst_adapter_take
gst_adapter_take_buffer
gst_adapter_take_list
gst_adapter_take
gst_adapter_take_buffer
gst_adapter_take_list
+ gst_base_parse_add_index_entry
+ gst_base_parse_convert_default
+ gst_base_parse_frame_init
+ gst_base_parse_get_type
+ gst_base_parse_push_frame
+ gst_base_parse_set_average_bitrate
+ gst_base_parse_set_duration
+ gst_base_parse_set_frame_rate
+ gst_base_parse_set_has_timing_info
+ gst_base_parse_set_min_frame_size
+ gst_base_parse_set_passthrough
+ gst_base_parse_set_syncable
gst_base_sink_do_preroll
gst_base_sink_get_blocksize
gst_base_sink_get_last_buffer
gst_base_sink_do_preroll
gst_base_sink_get_blocksize
gst_base_sink_get_last_buffer