summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNazar Mokrynskyi <nazar@mokrynskyi.com>2020-08-18 19:16:40 +0300
committerTim-Philipp Müller <tim@centricular.com>2020-10-12 13:02:07 +0100
commitc723624e1e43dd2b48bd91d39e6cd95a053da120 (patch)
treee941962d53073a11a538af5c58e9368e905a0bbe
parent8d195291c55dbbad7c6176e3b4799fdfa2815cfb (diff)
downloadgstreamer-plugins-bad-c723624e1e43dd2b48bd91d39e6cd95a053da120.tar.gz
rtmp2: fix code style, update documentation cache
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/gstrtmp2sink.c2
2 files changed, 38 insertions, 1 deletions
diff --git a/docs/plugins/gst_plugins_cache.json b/docs/plugins/gst_plugins_cache.json
index 9c9542933..caf507c42 100644
--- a/docs/plugins/gst_plugins_cache.json
+++ b/docs/plugins/gst_plugins_cache.json
@@ -216303,6 +216303,18 @@
"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"
@@ -216581,6 +216593,31 @@
"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/gstrtmp2sink.c b/gst/rtmp2/gstrtmp2sink.c
index 2b2bcdb8e..41b728c47 100644
--- a/gst/rtmp2/gstrtmp2sink.c
+++ b/gst/rtmp2/gstrtmp2sink.c
@@ -615,7 +615,7 @@ gst_rtmp2_sink_event (GstBaseSink * sink, GstEvent * event)
break;
}
- return GST_BASE_SINK_CLASS (gst_rtmp2_sink_parent_class)->event (sink, event);;
+ return GST_BASE_SINK_CLASS (gst_rtmp2_sink_parent_class)->event (sink, event);
}
static gboolean