summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2020-10-12 11:50:59 +0100
committerTim-Philipp Müller <tim@centricular.com>2020-10-12 13:31:37 +0100
commit0940339fcd4b85fd6361e5fb8e20b48a0fedfd26 (patch)
tree3ea84e3a07564a517e68ef997478bf6c18864f01
parent80b30f85b4eabcf1970387fbddeb12692b424a4f (diff)
rtmp2sink: don't expose stop-commands property in backported patches
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1628>
-rw-r--r--docs/plugins/gst_plugins_cache.json37
-rw-r--r--gst/rtmp2/gstrtmp2.c2
-rw-r--r--gst/rtmp2/gstrtmp2sink.c10
3 files changed, 11 insertions, 38 deletions
diff --git a/docs/plugins/gst_plugins_cache.json b/docs/plugins/gst_plugins_cache.json
index caf507c42..9c9542933 100644
--- a/docs/plugins/gst_plugins_cache.json
+++ b/docs/plugins/gst_plugins_cache.json
@@ -216303,18 +216303,6 @@
"readable": true,
"type": "GstStructure",
"writable": false
- },
- "stop-commands": {
- "blurb": "RTMP commands to send on EOS event before closing connection",
- "conditionally-available": false,
- "construct": false,
- "construct-only": false,
- "controllable": false,
- "default": "deletestream+fcunpublish",
- "mutable": "null",
- "readable": true,
- "type": "GstRtmpStopCommands",
- "writable": true
}
},
"rank": "primary + 1"
@@ -216593,31 +216581,6 @@
"value": "1"
}
]
- },
- "GstRtmpStopCommands": {
- "kind": "flags",
- "values": [
- {
- "desc": "No command",
- "name": "none",
- "value": "0x00000000"
- },
- {
- "desc": "FCUnpublish",
- "name": "fcunpublish",
- "value": "0x00000001"
- },
- {
- "desc": "closeStream",
- "name": "closestream",
- "value": "0x00000002"
- },
- {
- "desc": "deleteStream",
- "name": "deletestream",
- "value": "0x00000004"
- }
- ]
}
},
"package": "GStreamer Bad Plug-ins",
diff --git a/gst/rtmp2/gstrtmp2.c b/gst/rtmp2/gstrtmp2.c
index 1be1a3c5e..2fd2a23b3 100644
--- a/gst/rtmp2/gstrtmp2.c
+++ b/gst/rtmp2/gstrtmp2.c
@@ -38,7 +38,9 @@ plugin_init (GstPlugin * plugin)
gst_type_mark_as_plugin_api (GST_TYPE_RTMP_SCHEME, 0);
gst_type_mark_as_plugin_api (GST_TYPE_RTMP_AUTHMOD, 0);
+#if 0
gst_type_mark_as_plugin_api (GST_TYPE_RTMP_STOP_COMMANDS, 0);
+#endif
return TRUE;
}
diff --git a/gst/rtmp2/gstrtmp2sink.c b/gst/rtmp2/gstrtmp2sink.c
index 72026eb87..34637fcf7 100644
--- a/gst/rtmp2/gstrtmp2sink.c
+++ b/gst/rtmp2/gstrtmp2sink.c
@@ -149,7 +149,9 @@ enum
PROP_PEAK_KBPS,
PROP_CHUNK_SIZE,
PROP_STATS,
+#if 0
PROP_STOP_COMMANDS,
+#endif
};
/* pad templates */
@@ -231,7 +233,8 @@ gst_rtmp2_sink_class_init (GstRtmp2SinkClass * klass)
g_param_spec_boxed ("stats", "Stats", "Retrieve a statistics structure",
GST_TYPE_STRUCTURE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
- /**
+#if 0
+ /*
* GstRtmp2Sink:stop-commands:
*
* Which commands (if any) to send on EOS event before closing connection
@@ -243,6 +246,7 @@ gst_rtmp2_sink_class_init (GstRtmp2SinkClass * klass)
"RTMP commands to send on EOS event before closing connection",
GST_TYPE_RTMP_STOP_COMMANDS, GST_RTMP_DEFAULT_STOP_COMMANDS,
(GParamFlags) (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)));
+#endif
gst_type_mark_as_plugin_api (GST_TYPE_RTMP_LOCATION_HANDLER, 0);
GST_DEBUG_CATEGORY_INIT (gst_rtmp2_sink_debug_category, "rtmp2sink", 0,
@@ -378,11 +382,13 @@ gst_rtmp2_sink_set_property (GObject * object, guint property_id,
set_chunk_size (self);
g_mutex_unlock (&self->lock);
break;
+#if 0
case PROP_STOP_COMMANDS:
GST_OBJECT_LOCK (self);
self->stop_commands = g_value_get_flags (value);
GST_OBJECT_UNLOCK (self);
break;
+#endif
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@@ -480,11 +486,13 @@ gst_rtmp2_sink_get_property (GObject * object, guint property_id,
case PROP_STATS:
g_value_take_boxed (value, gst_rtmp2_sink_get_stats (self));
break;
+#if 0
case PROP_STOP_COMMANDS:
GST_OBJECT_LOCK (self);
g_value_set_flags (value, self->stop_commands);
GST_OBJECT_UNLOCK (self);
break;
+#endif
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;