projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rtspdefs: add RFC 4567 headers and status code
[platform/upstream/gstreamer.git]
/
gst-libs
/
gst
/
rtsp
/
gstrtspdefs.h
diff --git
a/gst-libs/gst/rtsp/gstrtspdefs.h
b/gst-libs/gst/rtsp/gstrtspdefs.h
index
d67babd
..
4a6e1fe
100644
(file)
--- a/
gst-libs/gst/rtsp/gstrtspdefs.h
+++ b/
gst-libs/gst/rtsp/gstrtspdefs.h
@@
-13,8
+13,8
@@
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- * Boston, MA 0211
1-1307
, USA.
+ * Free Software Foundation, Inc., 5
1 Franklin St, Fifth Floor
,
+ * Boston, MA 0211
0-1301
, USA.
*/
/*
* Unless otherwise indicated, Source Code is licensed under MIT license.
*/
/*
* Unless otherwise indicated, Source Code is licensed under MIT license.
@@
-158,7
+158,7
@@
typedef enum {
* GstRTSPVersion:
* @GST_RTSP_VERSION_INVALID: unknown/invalid version
* @GST_RTSP_VERSION_1_0: version 1.0
* GstRTSPVersion:
* @GST_RTSP_VERSION_INVALID: unknown/invalid version
* @GST_RTSP_VERSION_1_0: version 1.0
- * @GST_RTSP_VERSION_1_1: version 1.1.
Since 0.10.25
+ * @GST_RTSP_VERSION_1_1: version 1.1.
*
* The supported RTSP versions.
*/
*
* The supported RTSP versions.
*/
@@
-182,8
+182,8
@@
typedef enum {
* @GST_RTSP_SETUP: the SETUP method
* @GST_RTSP_SET_PARAMETER: the SET_PARAMETER method
* @GST_RTSP_TEARDOWN: the TEARDOWN method
* @GST_RTSP_SETUP: the SETUP method
* @GST_RTSP_SET_PARAMETER: the SET_PARAMETER method
* @GST_RTSP_TEARDOWN: the TEARDOWN method
- * @GST_RTSP_GET: the GET method (HTTP).
Since 0.10.25
- * @GST_RTSP_POST: the POST method (HTTP).
Since 0.10.25
+ * @GST_RTSP_GET: the GET method (HTTP).
+ * @GST_RTSP_POST: the POST method (HTTP).
*
* The different supported RTSP methods.
*/
*
* The different supported RTSP methods.
*/
@@
-228,10
+228,9
@@
typedef enum {
/**
* GstRTSPHeaderField:
*
/**
* GstRTSPHeaderField:
*
- * Enumeration of rtsp header fields
.
+ * Enumeration of rtsp header fields
*/
typedef enum {
*/
typedef enum {
- /*< protected >*/
GST_RTSP_HDR_INVALID,
/*
GST_RTSP_HDR_INVALID,
/*
@@
-333,16
+332,21
@@
typedef enum {
GST_RTSP_HDR_X_SERVER_IP_ADDRESS, /* X-Server-IP-Address */
GST_RTSP_HDR_X_SESSIONCOOKIE, /* X-Sessioncookie */
GST_RTSP_HDR_X_SERVER_IP_ADDRESS, /* X-Server-IP-Address */
GST_RTSP_HDR_X_SESSIONCOOKIE, /* X-Sessioncookie */
+ /* Since 0.10.36 */
+ GST_RTSP_HDR_RTCP_INTERVAL, /* RTCP-Interval */
+
+ /* Since 1.4 */
+ GST_RTSP_HDR_KEYMGMT, /* KeyMgmt */
+
GST_RTSP_HDR_LAST
} GstRTSPHeaderField;
/**
* GstRTSPStatusCode:
*
GST_RTSP_HDR_LAST
} GstRTSPHeaderField;
/**
* GstRTSPStatusCode:
*
- * Enumeration of rtsp status codes
.
+ * Enumeration of rtsp status codes
*/
typedef enum {
*/
typedef enum {
- /*< protected >*/
GST_RTSP_STS_INVALID = 0,
GST_RTSP_STS_CONTINUE = 100,
GST_RTSP_STS_OK = 200,
GST_RTSP_STS_INVALID = 0,
GST_RTSP_STS_CONTINUE = 100,
GST_RTSP_STS_OK = 200,
@@
-381,6
+385,7
@@
typedef enum {
GST_RTSP_STS_ONLY_AGGREGATE_OPERATION_ALLOWED = 460,
GST_RTSP_STS_UNSUPPORTED_TRANSPORT = 461,
GST_RTSP_STS_DESTINATION_UNREACHABLE = 462,
GST_RTSP_STS_ONLY_AGGREGATE_OPERATION_ALLOWED = 460,
GST_RTSP_STS_UNSUPPORTED_TRANSPORT = 461,
GST_RTSP_STS_DESTINATION_UNREACHABLE = 462,
+ GST_RTSP_STS_KEY_MANAGEMENT_FAILURE = 463, /* since 1.4 */
GST_RTSP_STS_INTERNAL_SERVER_ERROR = 500,
GST_RTSP_STS_NOT_IMPLEMENTED = 501,
GST_RTSP_STS_BAD_GATEWAY = 502,
GST_RTSP_STS_INTERNAL_SERVER_ERROR = 500,
GST_RTSP_STS_NOT_IMPLEMENTED = 501,
GST_RTSP_STS_BAD_GATEWAY = 502,
@@
-398,6
+403,7
@@
const gchar* gst_rtsp_header_as_text (GstRTSPHeaderField field);
const gchar* gst_rtsp_status_as_text (GstRTSPStatusCode code);
gchar* gst_rtsp_options_as_text (GstRTSPMethod options);
const gchar* gst_rtsp_status_as_text (GstRTSPStatusCode code);
gchar* gst_rtsp_options_as_text (GstRTSPMethod options);
+GstRTSPMethod gst_rtsp_options_from_text (const gchar *options);
GstRTSPHeaderField gst_rtsp_find_header_field (const gchar *header);
GstRTSPMethod gst_rtsp_find_method (const gchar *method);
GstRTSPHeaderField gst_rtsp_find_header_field (const gchar *header);
GstRTSPMethod gst_rtsp_find_method (const gchar *method);