avformat/tls: clean up new whip options

Timo Rothenpieler committed 1 year ago

Commit 3f7e0fd1 parent 4a4a5662 files · +5 −5Browse files

Unified · Split

2 files

libavformat/tls.h +3 −3
libavformat/whip.c +2 −2

     {"tls_verify", "Verify the peer certificate",         offsetof(pstruct, options_field . verify),    AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = TLS_OPTFL }, \
     {"cert_file",  "Certificate file",                    offsetof(pstruct, options_field . cert_file), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
     {"key_file",   "Private key file",                    offsetof(pstruct, options_field . key_file),  AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
+    {"cert_pem",   "Certificate PEM string",              offsetof(pstruct, options_field . cert_buf),  AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
+    {"key_pem",    "Private key PEM string",              offsetof(pstruct, options_field . key_buf),   AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
     {"listen",     "Listen for incoming connections",     offsetof(pstruct, options_field . listen),    AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = TLS_OPTFL }, \
     {"verifyhost", "Verify against a specific hostname",  offsetof(pstruct, options_field . host),      AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
     {"http_proxy", "Set proxy to tunnel through",         offsetof(pstruct, options_field . http_proxy), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL }, \
     {"use_external_udp", "Use external UDP from muxer or demuxer", offsetof(pstruct, options_field . use_external_udp), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 1, .flags = TLS_OPTFL }, \
-    {"mtu", "Maximum Transmission Unit", offsetof(pstruct, options_field . mtu), AV_OPT_TYPE_INT,  { .i64 = 0 }, 0, INT_MAX, .flags = TLS_OPTFL}, \
+    {"mtu",        "Maximum Transmission Unit",           offsetof(pstruct, options_field . mtu),       AV_OPT_TYPE_INT,  { .i64 = 0 }, 0, INT_MAX, .flags = TLS_OPTFL }
-    {"cert_buf", "The optional certificate buffer for DTLS", offsetof(pstruct, options_field . cert_buf), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL}, \
-    {"key_buf", "The optional private key buffer for DTLS", offsetof(pstruct, options_field . key_buf), AV_OPT_TYPE_STRING, .flags = TLS_OPTFL}
 int ff_tls_open_underlying(TLSShared *c, URLContext *parent, const char *uri, AVDictionary **options);

libavformat/whip.c+2−2

@@ -1291,12 +1291,12 @@ next_packet: · 1290 unmodified lines
1291	if (whip->cert_file) {	1291	if (whip->cert_file) {
1292	av_dict_set(&opts, "cert_file", whip->cert_file, 0);	1292	av_dict_set(&opts, "cert_file", whip->cert_file, 0);
1293	} else	1293	} else
1294	av_dict_set(&opts, "cert_buf", whip->cert_buf, 0);	1294	av_dict_set(&opts, "cert_pem", whip->cert_buf, 0);
1295		1295
1296	if (whip->key_file) {	1296	if (whip->key_file) {
1297	av_dict_set(&opts, "key_file", whip->key_file, 0);	1297	av_dict_set(&opts, "key_file", whip->key_file, 0);
1298	} else	1298	} else
1299	av_dict_set(&opts, "key_buf", whip->key_buf, 0);	1299	av_dict_set(&opts, "key_pem", whip->key_buf, 0);
1300	av_dict_set_int(&opts, "use_external_udp", 1, 0);	1300	av_dict_set_int(&opts, "use_external_udp", 1, 0);
1301	av_dict_set_int(&opts, "listen", 1, 0);	1301	av_dict_set_int(&opts, "listen", 1, 0);
1302	/* If got the first binding response, start DTLS handshake. */	1302	/* If got the first binding response, start DTLS handshake. */

avformat/tls: clean up new whip options

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code