mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-09 07:52:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpmp4vpay: Deprecated send-config property and replace by config-interval

Browse source 
Fixes bug #622412.
This commit is contained in:
Marc Leeman 2011-05-26 12:22:52 +02:00 committed by Sebastian Dröge
parent 74e0c05ff7
commit ff1c05d876
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/rtp/gstrtpmp4vpay.c
View file

@ -112,7 +112,8 @@ gst_rtp_mp4v_pay_class_init (GstRtpMP4VPayClass * klass)
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SEND_CONFIG, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SEND_CONFIG,
g_param_spec_boolean ("send-config", "Send Config", g_param_spec_boolean ("send-config", "Send Config",
"Send the config parameters in RTP packets as well", "Send the config parameters in RTP packets as well(deprecated "
"see config-interval)",
DEFAULT_SEND_CONFIG, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); DEFAULT_SEND_CONFIG, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BUFFER_LIST, g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BUFFER_LIST,
@ -491,7 +492,7 @@ gst_rtp_mp4v_pay_handle_buffer (GstBaseRTPPayload * basepayload,
flush = gst_rtp_mp4v_pay_depay_data (rtpmp4vpay, data, size, &strip, &vopi); flush = gst_rtp_mp4v_pay_depay_data (rtpmp4vpay, data, size, &strip, &vopi);
if (strip) { if (strip) {
/* strip off config if requested */ /* strip off config if requested */
if (!rtpmp4vpay->send_config) { if (!(rtpmp4vpay->config_interval > 0)) {
GstBuffer *subbuf; GstBuffer *subbuf;
GST_LOG_OBJECT (rtpmp4vpay, "stripping config at %d, size %d", strip, GST_LOG_OBJECT (rtpmp4vpay, "stripping config at %d, size %d", strip,
@ -511,8 +512,7 @@ gst_rtp_mp4v_pay_handle_buffer (GstBaseRTPPayload * basepayload,
} }
/* there is a config request, see if we need to insert it */ /* there is a config request, see if we need to insert it */
if (rtpmp4vpay->send_config && vopi && (rtpmp4vpay->config_interval > 0) && if (vopi && (rtpmp4vpay->config_interval > 0) && rtpmp4vpay->config) {
rtpmp4vpay->config) {
if (rtpmp4vpay->last_config != -1) { if (rtpmp4vpay->last_config != -1) {
guint64 diff; guint64 diff;
@ -629,6 +629,10 @@ gst_rtp_mp4v_pay_set_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case ARG_SEND_CONFIG: case ARG_SEND_CONFIG:
rtpmp4vpay->send_config = g_value_get_boolean (value); rtpmp4vpay->send_config = g_value_get_boolean (value);
/* send the configuration once every minute */
if (rtpmp4vpay->send_config && !(rtpmp4vpay->config_interval > 0)) {
rtpmp4vpay->config_interval = 60;
}
break; break;
case ARG_BUFFER_LIST: case ARG_BUFFER_LIST:
rtpmp4vpay->buffer_list = g_value_get_boolean (value); rtpmp4vpay->buffer_list = g_value_get_boolean (value);