diff --git a/docs/Doxyfile b/docs/Doxyfile index bd00fe5..da430f3 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -172,7 +172,7 @@ INLINE_INHERITED_MEMB = NO # shortest path that makes the file name unique will be used # The default value is: YES. -FULL_PATH_NAMES = YES +FULL_PATH_NAMES = NO # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. # Stripping is only done if one of the specified strings matches the left-hand diff --git a/docs/README.md b/docs/README.md index 60d1850..e144587 100644 --- a/docs/README.md +++ b/docs/README.md @@ -83,7 +83,8 @@ session->create_stream(..., RCE_SRTP | RCE_SRTP_KMNGMNT_ZRTP | RCE_SRTP_NULL_CIP | RCE_HOLEPUNCH_KEEPALIVE | Keep the hole made in the firewall open in case the streaming is unidirectional. If holepunching has been enabled during session creation and this flag is given to `create_stream()` and uvgRTP notices that the application has not sent any data in a while (unidirectionality), it sends a small UDP datagram to the remote participant to keep the connection open | | RCE_SRTP_KEYSIZE_192 | Use 196 bit SRTP keys, currently works only with RCE_SRTP_KMNGMNT_USER | | RCE_SRTP_KEYSIZE_256 | Use 256 bit SRTP keys, currently works only with RCE_SRTP_KMNGMNT_USER | -| RCE_ZRTP_MULTISTREAM_NO_DH | Select which streams do not perform Diffie-Hellman with ZRTP. Currently, ZRTP only works reliably with one stream performing DH and one not performing it | +| RCE_ZRTP_DIFFIE_HELLMAN_MODE | Select which streams performs the Diffie-Hellman with ZRTP (default) | +| RCE_ZRTP_MULTISTREAM_MODE | Select which streams do not perform Diffie-Hellman with ZRTP. Currently, ZRTP only works reliably with one stream performing DH and one not performing it | | RCE_FRAMERATE | Try to keep the sent framerate as constant as possible (default fps is 30) | | RCE_PACE_FRAGMENT_SENDING | Pace the sending of framents to frame interval to help receiver receive packets (default frame interval is 1/30) | @@ -146,7 +147,7 @@ uvgRTP provides two ways for an application to deal with SRTP key-management: 1) ### ZRTP-based SRTP uvgRTP supports Diffie-Hellman and Multistream modes of ZRTP. To use ZRTP, user must provide `RCE_SRTP | RCE_SRTP_KMNGMNT_ZRTP` flag combination -to `create_stream()` as well as `RCE_ZRTP_MULTISTREAM_NO_DH` flag for all streams which are in Multistream mode. See [ZRTP Multistream example](../examples/zrtp_multistream.cc) for more details. +to `create_stream()` as well as `RCE_ZRTP_MULTISTREAM_MODE` flag for all streams which are in Multistream mode. See [ZRTP Multistream example](../examples/zrtp_multistream.cc) for more details. ### User-managed SRTP diff --git a/docs/html/classuvgrtp_1_1context.html b/docs/html/classuvgrtp_1_1context.html index 9a56681..e9a7e13 100644 --- a/docs/html/classuvgrtp_1_1context.html +++ b/docs/html/classuvgrtp_1_1context.html @@ -294,7 +294,7 @@ Public Member Functions
The documentation for this class was generated from the following file: diff --git a/docs/html/classuvgrtp_1_1media__stream.html b/docs/html/classuvgrtp_1_1media__stream.html index d75ae01..5d3b313 100644 --- a/docs/html/classuvgrtp_1_1media__stream.html +++ b/docs/html/classuvgrtp_1_1media__stream.html @@ -617,7 +617,7 @@ Public Member Functions
The documentation for this class was generated from the following file: diff --git a/docs/html/classuvgrtp_1_1rtcp.html b/docs/html/classuvgrtp_1_1rtcp.html index c44fa4b..a3689ec 100644 --- a/docs/html/classuvgrtp_1_1rtcp.html +++ b/docs/html/classuvgrtp_1_1rtcp.html @@ -610,7 +610,7 @@ Public Member Functions
The documentation for this class was generated from the following file: diff --git a/docs/html/classuvgrtp_1_1session.html b/docs/html/classuvgrtp_1_1session.html index 9707b4c..a4107af 100644 --- a/docs/html/classuvgrtp_1_1session.html +++ b/docs/html/classuvgrtp_1_1session.html @@ -256,7 +256,7 @@ Public Member Functions
The documentation for this class was generated from the following file: diff --git a/docs/html/clock_8hh_source.html b/docs/html/clock_8hh_source.html index a7e6e4c..cee3c16 100644 --- a/docs/html/clock_8hh_source.html +++ b/docs/html/clock_8hh_source.html @@ -5,7 +5,7 @@ -uvgRTP: C:/Local/rasane22/Projects/Kvazzup/libraries/uvgRTP/include/uvgrtp/clock.hh Source File +uvgRTP: clock.hh Source File diff --git a/docs/html/context_8hh_source.html b/docs/html/context_8hh_source.html index 6f4c269..461f888 100644 --- a/docs/html/context_8hh_source.html +++ b/docs/html/context_8hh_source.html @@ -5,7 +5,7 @@ -uvgRTP: C:/Local/rasane22/Projects/Kvazzup/libraries/uvgRTP/include/uvgrtp/context.hh Source File +uvgRTP: context.hh Source File diff --git a/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html b/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html index 5fc21d2..a98e1cd 100644 --- a/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html +++ b/docs/html/dir_d44c64559bbebec7f509842c48db8b23.html @@ -5,7 +5,7 @@ -uvgRTP: C:/Local/rasane22/Projects/Kvazzup/libraries/uvgRTP/include Directory Reference +uvgRTP: include Directory Reference diff --git a/docs/html/dir_e3f96ff476f8286b6e150580a2f7bd74.html b/docs/html/dir_e3f96ff476f8286b6e150580a2f7bd74.html index d3a571a..7b97e26 100644 --- a/docs/html/dir_e3f96ff476f8286b6e150580a2f7bd74.html +++ b/docs/html/dir_e3f96ff476f8286b6e150580a2f7bd74.html @@ -5,7 +5,7 @@ -uvgRTP: C:/Local/rasane22/Projects/Kvazzup/libraries/uvgRTP/include/uvgrtp Directory Reference +uvgRTP: uvgrtp Directory Reference diff --git a/docs/html/frame_8hh_source.html b/docs/html/frame_8hh_source.html index e444c0f..86df6b6 100644 --- a/docs/html/frame_8hh_source.html +++ b/docs/html/frame_8hh_source.html @@ -5,7 +5,7 @@ -uvgRTP: C:/Local/rasane22/Projects/Kvazzup/libraries/uvgRTP/include/uvgrtp/frame.hh Source File +uvgRTP: frame.hh Source File diff --git a/docs/html/globals.html b/docs/html/globals.html index 5aefe76..72f7df6 100644 --- a/docs/html/globals.html +++ b/docs/html/globals.html @@ -101,7 +101,8 @@ $(function() {
  • RCE_SRTP_NULL_CIPHER : util.hh
  • RCE_SRTP_REPLAY_PROTECTION : util.hh
  • RCE_SYSTEM_CALL_CLUSTERING : util.hh
    • -
  • RCE_ZRTP_MULTISTREAM_NO_DH : util.hh
    • +
  • RCE_ZRTP_DIFFIE_HELLMAN_MODE : util.hh
    • +
  • RCE_ZRTP_MULTISTREAM_MODE : util.hh
  • RTP_AUTH_TAG_MISMATCH : util.hh
  • RTP_BIND_ERROR : util.hh
  • RTP_COPY : util.hh
    • diff --git a/docs/html/globals_eval.html b/docs/html/globals_eval.html index fd51e44..4bd582b 100644 --- a/docs/html/globals_eval.html +++ b/docs/html/globals_eval.html @@ -101,7 +101,8 @@ $(function() {
  • RCE_SRTP_NULL_CIPHER : util.hh
  • RCE_SRTP_REPLAY_PROTECTION : util.hh
  • RCE_SYSTEM_CALL_CLUSTERING : util.hh
    • -
  • RCE_ZRTP_MULTISTREAM_NO_DH : util.hh
    • +
  • RCE_ZRTP_DIFFIE_HELLMAN_MODE : util.hh
    • +
  • RCE_ZRTP_MULTISTREAM_MODE : util.hh
  • RTP_AUTH_TAG_MISMATCH : util.hh
  • RTP_BIND_ERROR : util.hh
  • RTP_COPY : util.hh
    • diff --git a/docs/html/lib_8hh_source.html b/docs/html/lib_8hh_source.html index d1a3b02..8548587 100644 --- a/docs/html/lib_8hh_source.html +++ b/docs/html/lib_8hh_source.html @@ -5,7 +5,7 @@ -uvgRTP: C:/Local/rasane22/Projects/Kvazzup/libraries/uvgRTP/include/uvgrtp/lib.hh Source File +uvgRTP: lib.hh Source File diff --git a/docs/html/media__stream_8hh_source.html b/docs/html/media__stream_8hh_source.html index 3727410..c148797 100644 --- a/docs/html/media__stream_8hh_source.html +++ b/docs/html/media__stream_8hh_source.html @@ -5,7 +5,7 @@ -uvgRTP: C:/Local/rasane22/Projects/Kvazzup/libraries/uvgRTP/include/uvgrtp/media_stream.hh Source File +uvgRTP: media_stream.hh Source File diff --git a/docs/html/rtcp_8hh_source.html b/docs/html/rtcp_8hh_source.html index 25497d6..227181a 100644 --- a/docs/html/rtcp_8hh_source.html +++ b/docs/html/rtcp_8hh_source.html @@ -5,7 +5,7 @@ -uvgRTP: C:/Local/rasane22/Projects/Kvazzup/libraries/uvgRTP/include/uvgrtp/rtcp.hh Source File +uvgRTP: rtcp.hh Source File diff --git a/docs/html/search/all_a.js b/docs/html/search/all_a.js index c9db9fc..bd6deab 100644 --- a/docs/html/search/all_a.js +++ b/docs/html/search/all_a.js @@ -28,69 +28,70 @@ var searchData= ['rce_5fsrtp_5fnull_5fcipher_25',['RCE_SRTP_NULL_CIPHER',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2afa4ddec7d182cec161d6b582589bc9baba',1,'util.hh']]], ['rce_5fsrtp_5freplay_5fprotection_26',['RCE_SRTP_REPLAY_PROTECTION',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2afaddd5fdb170d7cc194e4165d3f9e9a1c1',1,'util.hh']]], ['rce_5fsystem_5fcall_5fclustering_27',['RCE_SYSTEM_CALL_CLUSTERING',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2afa9e41141dacd18def5ab83e9f671f4263',1,'util.hh']]], - ['rce_5fzrtp_5fmultistream_5fno_5fdh_28',['RCE_ZRTP_MULTISTREAM_NO_DH',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2afa3afca34d8e1e5e856113a0fa32de03c6',1,'util.hh']]], - ['remove_5fall_5fhooks_29',['remove_all_hooks',['../classuvgrtp_1_1rtcp.html#a81198428cc697c0c7cbb2a4191f294d8',1,'uvgrtp::rtcp']]], - ['rtcp_30',['rtcp',['../classuvgrtp_1_1rtcp.html',1,'uvgrtp']]], - ['rtcp_5fapp_5fpacket_31',['rtcp_app_packet',['../structuvgrtp_1_1frame_1_1rtcp__app__packet.html',1,'uvgrtp::frame']]], - ['rtcp_5fheader_32',['rtcp_header',['../structuvgrtp_1_1frame_1_1rtcp__header.html',1,'uvgrtp::frame']]], - ['rtcp_5freceiver_5freport_33',['rtcp_receiver_report',['../structuvgrtp_1_1frame_1_1rtcp__receiver__report.html',1,'uvgrtp::frame']]], - ['rtcp_5freport_5fblock_34',['rtcp_report_block',['../structuvgrtp_1_1frame_1_1rtcp__report__block.html',1,'uvgrtp::frame']]], - ['rtcp_5fsdes_5fchunk_35',['rtcp_sdes_chunk',['../structuvgrtp_1_1frame_1_1rtcp__sdes__chunk.html',1,'uvgrtp::frame']]], - ['rtcp_5fsdes_5fitem_36',['rtcp_sdes_item',['../structuvgrtp_1_1frame_1_1rtcp__sdes__item.html',1,'uvgrtp::frame']]], - ['rtcp_5fsdes_5fpacket_37',['rtcp_sdes_packet',['../structuvgrtp_1_1frame_1_1rtcp__sdes__packet.html',1,'uvgrtp::frame']]], - ['rtcp_5fsender_5finfo_38',['rtcp_sender_info',['../structuvgrtp_1_1frame_1_1rtcp__sender__info.html',1,'uvgrtp::frame']]], - ['rtcp_5fsender_5freport_39',['rtcp_sender_report',['../structuvgrtp_1_1frame_1_1rtcp__sender__report.html',1,'uvgrtp::frame']]], - ['rtp_5fauth_5ftag_5fmismatch_40',['RTP_AUTH_TAG_MISMATCH',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba6d62ec0a7250a3db7c0f3a13280ecc65',1,'util.hh']]], - ['rtp_5fbind_5ferror_41',['RTP_BIND_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba000c0166a0c38686389fc2eba0ddc458',1,'util.hh']]], - ['rtp_5fcopy_42',['RTP_COPY',['../util_8hh.html#af03a75996471fc531742cd640c7caf2dab1d5797a23c37a33168046a2ae6aef6a',1,'util.hh']]], - ['rtp_5fctx_5fconfiguration_5fflags_43',['RTP_CTX_CONFIGURATION_FLAGS',['../util_8hh.html#aa98d9238629e33567e73af0d239e587f',1,'util.hh']]], - ['rtp_5fctx_5fenable_5fflags_44',['RTP_CTX_ENABLE_FLAGS',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2af',1,'util.hh']]], - ['rtp_5ferror_45',['RTP_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387b',1,'util.hh']]], - ['rtp_5fflags_46',['RTP_FLAGS',['../util_8hh.html#af03a75996471fc531742cd640c7caf2d',1,'util.hh']]], - ['rtp_5fformat_47',['RTP_FORMAT',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96',1,'util.hh']]], - ['rtp_5fformat_5fdvi4_5f32_48',['RTP_FORMAT_DVI4_32',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96abf1f20482ba40b0a4161f339978c65c8',1,'util.hh']]], - ['rtp_5fformat_5fdvi4_5f441_49',['RTP_FORMAT_DVI4_441',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96aa4e91d147dcc0696bae592e0de3ae295',1,'util.hh']]], - ['rtp_5fformat_5fdvi4_5f64_50',['RTP_FORMAT_DVI4_64',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ae0cb5522bf562899f9001adeb669f3ef',1,'util.hh']]], - ['rtp_5fformat_5fdvi4_5f882_51',['RTP_FORMAT_DVI4_882',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96abb0d59c256c7ed6b0f78aff67f89ac18',1,'util.hh']]], - ['rtp_5fformat_5fg722_52',['RTP_FORMAT_G722',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a2240ad1204186f7c34aacfb27673e692',1,'util.hh']]], - ['rtp_5fformat_5fg723_53',['RTP_FORMAT_G723',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96aa97d1880bfcfba08dfef863dc82426d1',1,'util.hh']]], - ['rtp_5fformat_5fg726_5f16_54',['RTP_FORMAT_G726_16',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ae118651d66f3af54be3094e7e71336c7',1,'util.hh']]], - ['rtp_5fformat_5fg726_5f24_55',['RTP_FORMAT_G726_24',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a8635bcd6f336c19271e7ea20eb9111cf',1,'util.hh']]], - ['rtp_5fformat_5fg726_5f32_56',['RTP_FORMAT_G726_32',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a266862cd2289619b5c4de4c259a32785',1,'util.hh']]], - ['rtp_5fformat_5fg726_5f40_57',['RTP_FORMAT_G726_40',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96af260843177efa05d95f98d30499db683',1,'util.hh']]], - ['rtp_5fformat_5fg728_58',['RTP_FORMAT_G728',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a0f194f13a6b06211c1411caf0a454313',1,'util.hh']]], - ['rtp_5fformat_5fg729_59',['RTP_FORMAT_G729',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a78da373e5b8fb9a83e28f5b8b715ca19',1,'util.hh']]], - ['rtp_5fformat_5fg729d_60',['RTP_FORMAT_G729D',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96af2981123dc924d80ed50371625927f58',1,'util.hh']]], - ['rtp_5fformat_5fg729e_61',['RTP_FORMAT_G729E',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96adba054e696e9d57d316c598618580a63',1,'util.hh']]], - ['rtp_5fformat_5fgeneric_62',['RTP_FORMAT_GENERIC',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ad4b1be929d880baa2c2ca85c614f61b9',1,'util.hh']]], - ['rtp_5fformat_5fgsm_63',['RTP_FORMAT_GSM',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96aa6d4ba4fb63005fac69fa371fdf18a68',1,'util.hh']]], - ['rtp_5fformat_5fgsm_5fefr_64',['RTP_FORMAT_GSM_EFR',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4e41697a659bea307ca6387330d5b9ed',1,'util.hh']]], - ['rtp_5fformat_5fh264_65',['RTP_FORMAT_H264',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ad785025a8de9a53f17dc84ec3eed85bd',1,'util.hh']]], - ['rtp_5fformat_5fh265_66',['RTP_FORMAT_H265',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4ee0ab7d51bf50f8f5a5cb995ecc407b',1,'util.hh']]], - ['rtp_5fformat_5fh266_67',['RTP_FORMAT_H266',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a0e3d0414b29804783324399c8a42c85d',1,'util.hh']]], - ['rtp_5fformat_5fl16_5fmono_68',['RTP_FORMAT_L16_MONO',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4c34cf9ef36a41ba3565b0e3f6ea534a',1,'util.hh']]], - ['rtp_5fformat_5fl16_5fstereo_69',['RTP_FORMAT_L16_STEREO',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a1de81aee545949cf4609fe3cca3ab1b8',1,'util.hh']]], - ['rtp_5fformat_5fl8_70',['RTP_FORMAT_L8',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96abee7466b11e455f2f2362dc39e61c6a8',1,'util.hh']]], - ['rtp_5fformat_5flpc_71',['RTP_FORMAT_LPC',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a61c2e69b79b0fd2a8fd0bb24fb359ecd',1,'util.hh']]], - ['rtp_5fformat_5fopus_72',['RTP_FORMAT_OPUS',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4e6ef095b4645cdc8aef241aad1f974b',1,'util.hh']]], - ['rtp_5fformat_5fpcma_73',['RTP_FORMAT_PCMA',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a518313e0a5342ff1b5b79ead46791b2e',1,'util.hh']]], - ['rtp_5fformat_5fpcmu_74',['RTP_FORMAT_PCMU',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a12448ad5b424a2f6d5028a7fd06019b7',1,'util.hh']]], - ['rtp_5fformat_5fvdvi_75',['RTP_FORMAT_VDVI',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a91525c8b53f821a6644803967be0e3ed',1,'util.hh']]], - ['rtp_5fframe_76',['rtp_frame',['../structuvgrtp_1_1frame_1_1rtp__frame.html',1,'uvgrtp::frame']]], - ['rtp_5fgeneric_5ferror_77',['RTP_GENERIC_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bafde486de26be732acf472480e3693b19',1,'util.hh']]], - ['rtp_5finitialized_78',['RTP_INITIALIZED',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba0759e9bb74c7a15ef09513547ed5cc2a',1,'util.hh']]], - ['rtp_5finvalid_5fvalue_79',['RTP_INVALID_VALUE',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba4cdd3c5db294a4f05294b264afbf678b',1,'util.hh']]], - ['rtp_5fmemory_5ferror_80',['RTP_MEMORY_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bac54e582250aec15bf2aea189ccbb0348',1,'util.hh']]], - ['rtp_5fno_5fflags_81',['RTP_NO_FLAGS',['../util_8hh.html#af03a75996471fc531742cd640c7caf2da084c095dae54bbbc6d9509568c58f9a6',1,'util.hh']]], - ['rtp_5fno_5fh26x_5fscl_82',['RTP_NO_H26X_SCL',['../util_8hh.html#af03a75996471fc531742cd640c7caf2dafd917713b62c18d5fa4106e42f3fbde8',1,'util.hh']]], - ['rtp_5fnot_5ffound_83',['RTP_NOT_FOUND',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba0a18f9856d2dd5890bb6ec25e4acf631',1,'util.hh']]], - ['rtp_5fnot_5finitialized_84',['RTP_NOT_INITIALIZED',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba32d67254c4da35568e7007ec3825f98a',1,'util.hh']]], - ['rtp_5fnot_5fsupported_85',['RTP_NOT_SUPPORTED',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba756d5cd372b045f069a493ed2f2cfa22',1,'util.hh']]], - ['rtp_5fok_86',['RTP_OK',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba0d701531b2bb1c027f5e5bcc64ed29e1',1,'util.hh']]], - ['rtp_5frecv_5ferror_87',['RTP_RECV_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387baa499befa487c22503360adffc590f33b',1,'util.hh']]], - ['rtp_5fsend_5ferror_88',['RTP_SEND_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba6c47e86944dbed4d33531236a6e28079',1,'util.hh']]], - ['rtp_5fsocket_5ferror_89',['RTP_SOCKET_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bab392a7774c551eed903855248760ad06',1,'util.hh']]], - ['rtp_5fssrc_5fcollision_90',['RTP_SSRC_COLLISION',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba80aa5b74c1e252c2ef49e0796d4183d3',1,'util.hh']]], - ['rtp_5ftimeout_91',['RTP_TIMEOUT',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bacb40716d1ab0663c0cce56f6d03f0902',1,'util.hh']]], - ['rtp_5fts_92',['rtp_ts',['../structuvgrtp_1_1frame_1_1rtcp__sender__info.html#a2e9c3d1fe1b522a1d4c6fb4bc1fbdbdf',1,'uvgrtp::frame::rtcp_sender_info']]] + ['rce_5fzrtp_5fdiffie_5fhellman_5fmode_28',['RCE_ZRTP_DIFFIE_HELLMAN_MODE',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2afa4fdf2b1f3f934315158b4204e71f9171',1,'util.hh']]], + ['rce_5fzrtp_5fmultistream_5fmode_29',['RCE_ZRTP_MULTISTREAM_MODE',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2afa9127265f0b1a1a45bac8e6fa7270a98a',1,'util.hh']]], + ['remove_5fall_5fhooks_30',['remove_all_hooks',['../classuvgrtp_1_1rtcp.html#a81198428cc697c0c7cbb2a4191f294d8',1,'uvgrtp::rtcp']]], + ['rtcp_31',['rtcp',['../classuvgrtp_1_1rtcp.html',1,'uvgrtp']]], + ['rtcp_5fapp_5fpacket_32',['rtcp_app_packet',['../structuvgrtp_1_1frame_1_1rtcp__app__packet.html',1,'uvgrtp::frame']]], + ['rtcp_5fheader_33',['rtcp_header',['../structuvgrtp_1_1frame_1_1rtcp__header.html',1,'uvgrtp::frame']]], + ['rtcp_5freceiver_5freport_34',['rtcp_receiver_report',['../structuvgrtp_1_1frame_1_1rtcp__receiver__report.html',1,'uvgrtp::frame']]], + ['rtcp_5freport_5fblock_35',['rtcp_report_block',['../structuvgrtp_1_1frame_1_1rtcp__report__block.html',1,'uvgrtp::frame']]], + ['rtcp_5fsdes_5fchunk_36',['rtcp_sdes_chunk',['../structuvgrtp_1_1frame_1_1rtcp__sdes__chunk.html',1,'uvgrtp::frame']]], + ['rtcp_5fsdes_5fitem_37',['rtcp_sdes_item',['../structuvgrtp_1_1frame_1_1rtcp__sdes__item.html',1,'uvgrtp::frame']]], + ['rtcp_5fsdes_5fpacket_38',['rtcp_sdes_packet',['../structuvgrtp_1_1frame_1_1rtcp__sdes__packet.html',1,'uvgrtp::frame']]], + ['rtcp_5fsender_5finfo_39',['rtcp_sender_info',['../structuvgrtp_1_1frame_1_1rtcp__sender__info.html',1,'uvgrtp::frame']]], + ['rtcp_5fsender_5freport_40',['rtcp_sender_report',['../structuvgrtp_1_1frame_1_1rtcp__sender__report.html',1,'uvgrtp::frame']]], + ['rtp_5fauth_5ftag_5fmismatch_41',['RTP_AUTH_TAG_MISMATCH',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba6d62ec0a7250a3db7c0f3a13280ecc65',1,'util.hh']]], + ['rtp_5fbind_5ferror_42',['RTP_BIND_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba000c0166a0c38686389fc2eba0ddc458',1,'util.hh']]], + ['rtp_5fcopy_43',['RTP_COPY',['../util_8hh.html#af03a75996471fc531742cd640c7caf2dab1d5797a23c37a33168046a2ae6aef6a',1,'util.hh']]], + ['rtp_5fctx_5fconfiguration_5fflags_44',['RTP_CTX_CONFIGURATION_FLAGS',['../util_8hh.html#aa98d9238629e33567e73af0d239e587f',1,'util.hh']]], + ['rtp_5fctx_5fenable_5fflags_45',['RTP_CTX_ENABLE_FLAGS',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2af',1,'util.hh']]], + ['rtp_5ferror_46',['RTP_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387b',1,'util.hh']]], + ['rtp_5fflags_47',['RTP_FLAGS',['../util_8hh.html#af03a75996471fc531742cd640c7caf2d',1,'util.hh']]], + ['rtp_5fformat_48',['RTP_FORMAT',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96',1,'util.hh']]], + ['rtp_5fformat_5fdvi4_5f32_49',['RTP_FORMAT_DVI4_32',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96abf1f20482ba40b0a4161f339978c65c8',1,'util.hh']]], + ['rtp_5fformat_5fdvi4_5f441_50',['RTP_FORMAT_DVI4_441',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96aa4e91d147dcc0696bae592e0de3ae295',1,'util.hh']]], + ['rtp_5fformat_5fdvi4_5f64_51',['RTP_FORMAT_DVI4_64',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ae0cb5522bf562899f9001adeb669f3ef',1,'util.hh']]], + ['rtp_5fformat_5fdvi4_5f882_52',['RTP_FORMAT_DVI4_882',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96abb0d59c256c7ed6b0f78aff67f89ac18',1,'util.hh']]], + ['rtp_5fformat_5fg722_53',['RTP_FORMAT_G722',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a2240ad1204186f7c34aacfb27673e692',1,'util.hh']]], + ['rtp_5fformat_5fg723_54',['RTP_FORMAT_G723',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96aa97d1880bfcfba08dfef863dc82426d1',1,'util.hh']]], + ['rtp_5fformat_5fg726_5f16_55',['RTP_FORMAT_G726_16',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ae118651d66f3af54be3094e7e71336c7',1,'util.hh']]], + ['rtp_5fformat_5fg726_5f24_56',['RTP_FORMAT_G726_24',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a8635bcd6f336c19271e7ea20eb9111cf',1,'util.hh']]], + ['rtp_5fformat_5fg726_5f32_57',['RTP_FORMAT_G726_32',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a266862cd2289619b5c4de4c259a32785',1,'util.hh']]], + ['rtp_5fformat_5fg726_5f40_58',['RTP_FORMAT_G726_40',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96af260843177efa05d95f98d30499db683',1,'util.hh']]], + ['rtp_5fformat_5fg728_59',['RTP_FORMAT_G728',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a0f194f13a6b06211c1411caf0a454313',1,'util.hh']]], + ['rtp_5fformat_5fg729_60',['RTP_FORMAT_G729',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a78da373e5b8fb9a83e28f5b8b715ca19',1,'util.hh']]], + ['rtp_5fformat_5fg729d_61',['RTP_FORMAT_G729D',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96af2981123dc924d80ed50371625927f58',1,'util.hh']]], + ['rtp_5fformat_5fg729e_62',['RTP_FORMAT_G729E',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96adba054e696e9d57d316c598618580a63',1,'util.hh']]], + ['rtp_5fformat_5fgeneric_63',['RTP_FORMAT_GENERIC',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ad4b1be929d880baa2c2ca85c614f61b9',1,'util.hh']]], + ['rtp_5fformat_5fgsm_64',['RTP_FORMAT_GSM',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96aa6d4ba4fb63005fac69fa371fdf18a68',1,'util.hh']]], + ['rtp_5fformat_5fgsm_5fefr_65',['RTP_FORMAT_GSM_EFR',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4e41697a659bea307ca6387330d5b9ed',1,'util.hh']]], + ['rtp_5fformat_5fh264_66',['RTP_FORMAT_H264',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ad785025a8de9a53f17dc84ec3eed85bd',1,'util.hh']]], + ['rtp_5fformat_5fh265_67',['RTP_FORMAT_H265',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4ee0ab7d51bf50f8f5a5cb995ecc407b',1,'util.hh']]], + ['rtp_5fformat_5fh266_68',['RTP_FORMAT_H266',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a0e3d0414b29804783324399c8a42c85d',1,'util.hh']]], + ['rtp_5fformat_5fl16_5fmono_69',['RTP_FORMAT_L16_MONO',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4c34cf9ef36a41ba3565b0e3f6ea534a',1,'util.hh']]], + ['rtp_5fformat_5fl16_5fstereo_70',['RTP_FORMAT_L16_STEREO',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a1de81aee545949cf4609fe3cca3ab1b8',1,'util.hh']]], + ['rtp_5fformat_5fl8_71',['RTP_FORMAT_L8',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96abee7466b11e455f2f2362dc39e61c6a8',1,'util.hh']]], + ['rtp_5fformat_5flpc_72',['RTP_FORMAT_LPC',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a61c2e69b79b0fd2a8fd0bb24fb359ecd',1,'util.hh']]], + ['rtp_5fformat_5fopus_73',['RTP_FORMAT_OPUS',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4e6ef095b4645cdc8aef241aad1f974b',1,'util.hh']]], + ['rtp_5fformat_5fpcma_74',['RTP_FORMAT_PCMA',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a518313e0a5342ff1b5b79ead46791b2e',1,'util.hh']]], + ['rtp_5fformat_5fpcmu_75',['RTP_FORMAT_PCMU',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a12448ad5b424a2f6d5028a7fd06019b7',1,'util.hh']]], + ['rtp_5fformat_5fvdvi_76',['RTP_FORMAT_VDVI',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a91525c8b53f821a6644803967be0e3ed',1,'util.hh']]], + ['rtp_5fframe_77',['rtp_frame',['../structuvgrtp_1_1frame_1_1rtp__frame.html',1,'uvgrtp::frame']]], + ['rtp_5fgeneric_5ferror_78',['RTP_GENERIC_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bafde486de26be732acf472480e3693b19',1,'util.hh']]], + ['rtp_5finitialized_79',['RTP_INITIALIZED',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba0759e9bb74c7a15ef09513547ed5cc2a',1,'util.hh']]], + ['rtp_5finvalid_5fvalue_80',['RTP_INVALID_VALUE',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba4cdd3c5db294a4f05294b264afbf678b',1,'util.hh']]], + ['rtp_5fmemory_5ferror_81',['RTP_MEMORY_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bac54e582250aec15bf2aea189ccbb0348',1,'util.hh']]], + ['rtp_5fno_5fflags_82',['RTP_NO_FLAGS',['../util_8hh.html#af03a75996471fc531742cd640c7caf2da084c095dae54bbbc6d9509568c58f9a6',1,'util.hh']]], + ['rtp_5fno_5fh26x_5fscl_83',['RTP_NO_H26X_SCL',['../util_8hh.html#af03a75996471fc531742cd640c7caf2dafd917713b62c18d5fa4106e42f3fbde8',1,'util.hh']]], + ['rtp_5fnot_5ffound_84',['RTP_NOT_FOUND',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba0a18f9856d2dd5890bb6ec25e4acf631',1,'util.hh']]], + ['rtp_5fnot_5finitialized_85',['RTP_NOT_INITIALIZED',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba32d67254c4da35568e7007ec3825f98a',1,'util.hh']]], + ['rtp_5fnot_5fsupported_86',['RTP_NOT_SUPPORTED',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba756d5cd372b045f069a493ed2f2cfa22',1,'util.hh']]], + ['rtp_5fok_87',['RTP_OK',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba0d701531b2bb1c027f5e5bcc64ed29e1',1,'util.hh']]], + ['rtp_5frecv_5ferror_88',['RTP_RECV_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387baa499befa487c22503360adffc590f33b',1,'util.hh']]], + ['rtp_5fsend_5ferror_89',['RTP_SEND_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba6c47e86944dbed4d33531236a6e28079',1,'util.hh']]], + ['rtp_5fsocket_5ferror_90',['RTP_SOCKET_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bab392a7774c551eed903855248760ad06',1,'util.hh']]], + ['rtp_5fssrc_5fcollision_91',['RTP_SSRC_COLLISION',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba80aa5b74c1e252c2ef49e0796d4183d3',1,'util.hh']]], + ['rtp_5ftimeout_92',['RTP_TIMEOUT',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bacb40716d1ab0663c0cce56f6d03f0902',1,'util.hh']]], + ['rtp_5fts_93',['rtp_ts',['../structuvgrtp_1_1frame_1_1rtcp__sender__info.html#a2e9c3d1fe1b522a1d4c6fb4bc1fbdbdf',1,'uvgrtp::frame::rtcp_sender_info']]] ]; diff --git a/docs/html/search/enumvalues_0.js b/docs/html/search/enumvalues_0.js index e3cfd20..12da803 100644 --- a/docs/html/search/enumvalues_0.js +++ b/docs/html/search/enumvalues_0.js @@ -28,51 +28,52 @@ var searchData= ['rce_5fsrtp_5fnull_5fcipher_25',['RCE_SRTP_NULL_CIPHER',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2afa4ddec7d182cec161d6b582589bc9baba',1,'util.hh']]], ['rce_5fsrtp_5freplay_5fprotection_26',['RCE_SRTP_REPLAY_PROTECTION',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2afaddd5fdb170d7cc194e4165d3f9e9a1c1',1,'util.hh']]], ['rce_5fsystem_5fcall_5fclustering_27',['RCE_SYSTEM_CALL_CLUSTERING',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2afa9e41141dacd18def5ab83e9f671f4263',1,'util.hh']]], - ['rce_5fzrtp_5fmultistream_5fno_5fdh_28',['RCE_ZRTP_MULTISTREAM_NO_DH',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2afa3afca34d8e1e5e856113a0fa32de03c6',1,'util.hh']]], - ['rtp_5fauth_5ftag_5fmismatch_29',['RTP_AUTH_TAG_MISMATCH',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba6d62ec0a7250a3db7c0f3a13280ecc65',1,'util.hh']]], - ['rtp_5fbind_5ferror_30',['RTP_BIND_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba000c0166a0c38686389fc2eba0ddc458',1,'util.hh']]], - ['rtp_5fcopy_31',['RTP_COPY',['../util_8hh.html#af03a75996471fc531742cd640c7caf2dab1d5797a23c37a33168046a2ae6aef6a',1,'util.hh']]], - ['rtp_5fformat_5fdvi4_5f32_32',['RTP_FORMAT_DVI4_32',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96abf1f20482ba40b0a4161f339978c65c8',1,'util.hh']]], - ['rtp_5fformat_5fdvi4_5f441_33',['RTP_FORMAT_DVI4_441',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96aa4e91d147dcc0696bae592e0de3ae295',1,'util.hh']]], - ['rtp_5fformat_5fdvi4_5f64_34',['RTP_FORMAT_DVI4_64',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ae0cb5522bf562899f9001adeb669f3ef',1,'util.hh']]], - ['rtp_5fformat_5fdvi4_5f882_35',['RTP_FORMAT_DVI4_882',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96abb0d59c256c7ed6b0f78aff67f89ac18',1,'util.hh']]], - ['rtp_5fformat_5fg722_36',['RTP_FORMAT_G722',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a2240ad1204186f7c34aacfb27673e692',1,'util.hh']]], - ['rtp_5fformat_5fg723_37',['RTP_FORMAT_G723',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96aa97d1880bfcfba08dfef863dc82426d1',1,'util.hh']]], - ['rtp_5fformat_5fg726_5f16_38',['RTP_FORMAT_G726_16',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ae118651d66f3af54be3094e7e71336c7',1,'util.hh']]], - ['rtp_5fformat_5fg726_5f24_39',['RTP_FORMAT_G726_24',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a8635bcd6f336c19271e7ea20eb9111cf',1,'util.hh']]], - ['rtp_5fformat_5fg726_5f32_40',['RTP_FORMAT_G726_32',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a266862cd2289619b5c4de4c259a32785',1,'util.hh']]], - ['rtp_5fformat_5fg726_5f40_41',['RTP_FORMAT_G726_40',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96af260843177efa05d95f98d30499db683',1,'util.hh']]], - ['rtp_5fformat_5fg728_42',['RTP_FORMAT_G728',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a0f194f13a6b06211c1411caf0a454313',1,'util.hh']]], - ['rtp_5fformat_5fg729_43',['RTP_FORMAT_G729',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a78da373e5b8fb9a83e28f5b8b715ca19',1,'util.hh']]], - ['rtp_5fformat_5fg729d_44',['RTP_FORMAT_G729D',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96af2981123dc924d80ed50371625927f58',1,'util.hh']]], - ['rtp_5fformat_5fg729e_45',['RTP_FORMAT_G729E',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96adba054e696e9d57d316c598618580a63',1,'util.hh']]], - ['rtp_5fformat_5fgeneric_46',['RTP_FORMAT_GENERIC',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ad4b1be929d880baa2c2ca85c614f61b9',1,'util.hh']]], - ['rtp_5fformat_5fgsm_47',['RTP_FORMAT_GSM',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96aa6d4ba4fb63005fac69fa371fdf18a68',1,'util.hh']]], - ['rtp_5fformat_5fgsm_5fefr_48',['RTP_FORMAT_GSM_EFR',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4e41697a659bea307ca6387330d5b9ed',1,'util.hh']]], - ['rtp_5fformat_5fh264_49',['RTP_FORMAT_H264',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ad785025a8de9a53f17dc84ec3eed85bd',1,'util.hh']]], - ['rtp_5fformat_5fh265_50',['RTP_FORMAT_H265',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4ee0ab7d51bf50f8f5a5cb995ecc407b',1,'util.hh']]], - ['rtp_5fformat_5fh266_51',['RTP_FORMAT_H266',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a0e3d0414b29804783324399c8a42c85d',1,'util.hh']]], - ['rtp_5fformat_5fl16_5fmono_52',['RTP_FORMAT_L16_MONO',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4c34cf9ef36a41ba3565b0e3f6ea534a',1,'util.hh']]], - ['rtp_5fformat_5fl16_5fstereo_53',['RTP_FORMAT_L16_STEREO',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a1de81aee545949cf4609fe3cca3ab1b8',1,'util.hh']]], - ['rtp_5fformat_5fl8_54',['RTP_FORMAT_L8',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96abee7466b11e455f2f2362dc39e61c6a8',1,'util.hh']]], - ['rtp_5fformat_5flpc_55',['RTP_FORMAT_LPC',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a61c2e69b79b0fd2a8fd0bb24fb359ecd',1,'util.hh']]], - ['rtp_5fformat_5fopus_56',['RTP_FORMAT_OPUS',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4e6ef095b4645cdc8aef241aad1f974b',1,'util.hh']]], - ['rtp_5fformat_5fpcma_57',['RTP_FORMAT_PCMA',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a518313e0a5342ff1b5b79ead46791b2e',1,'util.hh']]], - ['rtp_5fformat_5fpcmu_58',['RTP_FORMAT_PCMU',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a12448ad5b424a2f6d5028a7fd06019b7',1,'util.hh']]], - ['rtp_5fformat_5fvdvi_59',['RTP_FORMAT_VDVI',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a91525c8b53f821a6644803967be0e3ed',1,'util.hh']]], - ['rtp_5fgeneric_5ferror_60',['RTP_GENERIC_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bafde486de26be732acf472480e3693b19',1,'util.hh']]], - ['rtp_5finitialized_61',['RTP_INITIALIZED',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba0759e9bb74c7a15ef09513547ed5cc2a',1,'util.hh']]], - ['rtp_5finvalid_5fvalue_62',['RTP_INVALID_VALUE',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba4cdd3c5db294a4f05294b264afbf678b',1,'util.hh']]], - ['rtp_5fmemory_5ferror_63',['RTP_MEMORY_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bac54e582250aec15bf2aea189ccbb0348',1,'util.hh']]], - ['rtp_5fno_5fflags_64',['RTP_NO_FLAGS',['../util_8hh.html#af03a75996471fc531742cd640c7caf2da084c095dae54bbbc6d9509568c58f9a6',1,'util.hh']]], - ['rtp_5fno_5fh26x_5fscl_65',['RTP_NO_H26X_SCL',['../util_8hh.html#af03a75996471fc531742cd640c7caf2dafd917713b62c18d5fa4106e42f3fbde8',1,'util.hh']]], - ['rtp_5fnot_5ffound_66',['RTP_NOT_FOUND',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba0a18f9856d2dd5890bb6ec25e4acf631',1,'util.hh']]], - ['rtp_5fnot_5finitialized_67',['RTP_NOT_INITIALIZED',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba32d67254c4da35568e7007ec3825f98a',1,'util.hh']]], - ['rtp_5fnot_5fsupported_68',['RTP_NOT_SUPPORTED',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba756d5cd372b045f069a493ed2f2cfa22',1,'util.hh']]], - ['rtp_5fok_69',['RTP_OK',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba0d701531b2bb1c027f5e5bcc64ed29e1',1,'util.hh']]], - ['rtp_5frecv_5ferror_70',['RTP_RECV_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387baa499befa487c22503360adffc590f33b',1,'util.hh']]], - ['rtp_5fsend_5ferror_71',['RTP_SEND_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba6c47e86944dbed4d33531236a6e28079',1,'util.hh']]], - ['rtp_5fsocket_5ferror_72',['RTP_SOCKET_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bab392a7774c551eed903855248760ad06',1,'util.hh']]], - ['rtp_5fssrc_5fcollision_73',['RTP_SSRC_COLLISION',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba80aa5b74c1e252c2ef49e0796d4183d3',1,'util.hh']]], - ['rtp_5ftimeout_74',['RTP_TIMEOUT',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bacb40716d1ab0663c0cce56f6d03f0902',1,'util.hh']]] + ['rce_5fzrtp_5fdiffie_5fhellman_5fmode_28',['RCE_ZRTP_DIFFIE_HELLMAN_MODE',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2afa4fdf2b1f3f934315158b4204e71f9171',1,'util.hh']]], + ['rce_5fzrtp_5fmultistream_5fmode_29',['RCE_ZRTP_MULTISTREAM_MODE',['../util_8hh.html#a15b2d6364db6065a482c99827f4bd2afa9127265f0b1a1a45bac8e6fa7270a98a',1,'util.hh']]], + ['rtp_5fauth_5ftag_5fmismatch_30',['RTP_AUTH_TAG_MISMATCH',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba6d62ec0a7250a3db7c0f3a13280ecc65',1,'util.hh']]], + ['rtp_5fbind_5ferror_31',['RTP_BIND_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba000c0166a0c38686389fc2eba0ddc458',1,'util.hh']]], + ['rtp_5fcopy_32',['RTP_COPY',['../util_8hh.html#af03a75996471fc531742cd640c7caf2dab1d5797a23c37a33168046a2ae6aef6a',1,'util.hh']]], + ['rtp_5fformat_5fdvi4_5f32_33',['RTP_FORMAT_DVI4_32',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96abf1f20482ba40b0a4161f339978c65c8',1,'util.hh']]], + ['rtp_5fformat_5fdvi4_5f441_34',['RTP_FORMAT_DVI4_441',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96aa4e91d147dcc0696bae592e0de3ae295',1,'util.hh']]], + ['rtp_5fformat_5fdvi4_5f64_35',['RTP_FORMAT_DVI4_64',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ae0cb5522bf562899f9001adeb669f3ef',1,'util.hh']]], + ['rtp_5fformat_5fdvi4_5f882_36',['RTP_FORMAT_DVI4_882',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96abb0d59c256c7ed6b0f78aff67f89ac18',1,'util.hh']]], + ['rtp_5fformat_5fg722_37',['RTP_FORMAT_G722',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a2240ad1204186f7c34aacfb27673e692',1,'util.hh']]], + ['rtp_5fformat_5fg723_38',['RTP_FORMAT_G723',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96aa97d1880bfcfba08dfef863dc82426d1',1,'util.hh']]], + ['rtp_5fformat_5fg726_5f16_39',['RTP_FORMAT_G726_16',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ae118651d66f3af54be3094e7e71336c7',1,'util.hh']]], + ['rtp_5fformat_5fg726_5f24_40',['RTP_FORMAT_G726_24',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a8635bcd6f336c19271e7ea20eb9111cf',1,'util.hh']]], + ['rtp_5fformat_5fg726_5f32_41',['RTP_FORMAT_G726_32',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a266862cd2289619b5c4de4c259a32785',1,'util.hh']]], + ['rtp_5fformat_5fg726_5f40_42',['RTP_FORMAT_G726_40',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96af260843177efa05d95f98d30499db683',1,'util.hh']]], + ['rtp_5fformat_5fg728_43',['RTP_FORMAT_G728',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a0f194f13a6b06211c1411caf0a454313',1,'util.hh']]], + ['rtp_5fformat_5fg729_44',['RTP_FORMAT_G729',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a78da373e5b8fb9a83e28f5b8b715ca19',1,'util.hh']]], + ['rtp_5fformat_5fg729d_45',['RTP_FORMAT_G729D',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96af2981123dc924d80ed50371625927f58',1,'util.hh']]], + ['rtp_5fformat_5fg729e_46',['RTP_FORMAT_G729E',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96adba054e696e9d57d316c598618580a63',1,'util.hh']]], + ['rtp_5fformat_5fgeneric_47',['RTP_FORMAT_GENERIC',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ad4b1be929d880baa2c2ca85c614f61b9',1,'util.hh']]], + ['rtp_5fformat_5fgsm_48',['RTP_FORMAT_GSM',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96aa6d4ba4fb63005fac69fa371fdf18a68',1,'util.hh']]], + ['rtp_5fformat_5fgsm_5fefr_49',['RTP_FORMAT_GSM_EFR',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4e41697a659bea307ca6387330d5b9ed',1,'util.hh']]], + ['rtp_5fformat_5fh264_50',['RTP_FORMAT_H264',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96ad785025a8de9a53f17dc84ec3eed85bd',1,'util.hh']]], + ['rtp_5fformat_5fh265_51',['RTP_FORMAT_H265',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4ee0ab7d51bf50f8f5a5cb995ecc407b',1,'util.hh']]], + ['rtp_5fformat_5fh266_52',['RTP_FORMAT_H266',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a0e3d0414b29804783324399c8a42c85d',1,'util.hh']]], + ['rtp_5fformat_5fl16_5fmono_53',['RTP_FORMAT_L16_MONO',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4c34cf9ef36a41ba3565b0e3f6ea534a',1,'util.hh']]], + ['rtp_5fformat_5fl16_5fstereo_54',['RTP_FORMAT_L16_STEREO',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a1de81aee545949cf4609fe3cca3ab1b8',1,'util.hh']]], + ['rtp_5fformat_5fl8_55',['RTP_FORMAT_L8',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96abee7466b11e455f2f2362dc39e61c6a8',1,'util.hh']]], + ['rtp_5fformat_5flpc_56',['RTP_FORMAT_LPC',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a61c2e69b79b0fd2a8fd0bb24fb359ecd',1,'util.hh']]], + ['rtp_5fformat_5fopus_57',['RTP_FORMAT_OPUS',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a4e6ef095b4645cdc8aef241aad1f974b',1,'util.hh']]], + ['rtp_5fformat_5fpcma_58',['RTP_FORMAT_PCMA',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a518313e0a5342ff1b5b79ead46791b2e',1,'util.hh']]], + ['rtp_5fformat_5fpcmu_59',['RTP_FORMAT_PCMU',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a12448ad5b424a2f6d5028a7fd06019b7',1,'util.hh']]], + ['rtp_5fformat_5fvdvi_60',['RTP_FORMAT_VDVI',['../util_8hh.html#a313c6640ac5ed9384184a94ec57a9a96a91525c8b53f821a6644803967be0e3ed',1,'util.hh']]], + ['rtp_5fgeneric_5ferror_61',['RTP_GENERIC_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bafde486de26be732acf472480e3693b19',1,'util.hh']]], + ['rtp_5finitialized_62',['RTP_INITIALIZED',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba0759e9bb74c7a15ef09513547ed5cc2a',1,'util.hh']]], + ['rtp_5finvalid_5fvalue_63',['RTP_INVALID_VALUE',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba4cdd3c5db294a4f05294b264afbf678b',1,'util.hh']]], + ['rtp_5fmemory_5ferror_64',['RTP_MEMORY_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bac54e582250aec15bf2aea189ccbb0348',1,'util.hh']]], + ['rtp_5fno_5fflags_65',['RTP_NO_FLAGS',['../util_8hh.html#af03a75996471fc531742cd640c7caf2da084c095dae54bbbc6d9509568c58f9a6',1,'util.hh']]], + ['rtp_5fno_5fh26x_5fscl_66',['RTP_NO_H26X_SCL',['../util_8hh.html#af03a75996471fc531742cd640c7caf2dafd917713b62c18d5fa4106e42f3fbde8',1,'util.hh']]], + ['rtp_5fnot_5ffound_67',['RTP_NOT_FOUND',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba0a18f9856d2dd5890bb6ec25e4acf631',1,'util.hh']]], + ['rtp_5fnot_5finitialized_68',['RTP_NOT_INITIALIZED',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba32d67254c4da35568e7007ec3825f98a',1,'util.hh']]], + ['rtp_5fnot_5fsupported_69',['RTP_NOT_SUPPORTED',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba756d5cd372b045f069a493ed2f2cfa22',1,'util.hh']]], + ['rtp_5fok_70',['RTP_OK',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba0d701531b2bb1c027f5e5bcc64ed29e1',1,'util.hh']]], + ['rtp_5frecv_5ferror_71',['RTP_RECV_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387baa499befa487c22503360adffc590f33b',1,'util.hh']]], + ['rtp_5fsend_5ferror_72',['RTP_SEND_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba6c47e86944dbed4d33531236a6e28079',1,'util.hh']]], + ['rtp_5fsocket_5ferror_73',['RTP_SOCKET_ERROR',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bab392a7774c551eed903855248760ad06',1,'util.hh']]], + ['rtp_5fssrc_5fcollision_74',['RTP_SSRC_COLLISION',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387ba80aa5b74c1e252c2ef49e0796d4183d3',1,'util.hh']]], + ['rtp_5ftimeout_75',['RTP_TIMEOUT',['../util_8hh.html#aa6dc3f3578923d1afc40045e4cbe387bacb40716d1ab0663c0cce56f6d03f0902',1,'util.hh']]] ]; diff --git a/docs/html/session_8hh_source.html b/docs/html/session_8hh_source.html index 440779c..37eb56d 100644 --- a/docs/html/session_8hh_source.html +++ b/docs/html/session_8hh_source.html @@ -5,7 +5,7 @@ -uvgRTP: C:/Local/rasane22/Projects/Kvazzup/libraries/uvgRTP/include/uvgrtp/session.hh Source File +uvgRTP: session.hh Source File diff --git a/docs/html/structuvgrtp_1_1frame_1_1rtcp__app__packet.html b/docs/html/structuvgrtp_1_1frame_1_1rtcp__app__packet.html index c4c05c0..5978da8 100644 --- a/docs/html/structuvgrtp_1_1frame_1_1rtcp__app__packet.html +++ b/docs/html/structuvgrtp_1_1frame_1_1rtcp__app__packet.html @@ -188,7 +188,7 @@ Public Attributes
    The documentation for this struct was generated from the following file: diff --git a/docs/html/structuvgrtp_1_1frame_1_1rtcp__header.html b/docs/html/structuvgrtp_1_1frame_1_1rtcp__header.html index 79dc8a2..b72a0cb 100644 --- a/docs/html/structuvgrtp_1_1frame_1_1rtcp__header.html +++ b/docs/html/structuvgrtp_1_1frame_1_1rtcp__header.html @@ -227,7 +227,7 @@ union {
    The documentation for this struct was generated from the following file: diff --git a/docs/html/structuvgrtp_1_1frame_1_1rtcp__receiver__report.html b/docs/html/structuvgrtp_1_1frame_1_1rtcp__receiver__report.html index 1cb4afa..8c39f5a 100644 --- a/docs/html/structuvgrtp_1_1frame_1_1rtcp__receiver__report.html +++ b/docs/html/structuvgrtp_1_1frame_1_1rtcp__receiver__report.html @@ -149,7 +149,7 @@ Public Attributes
    The documentation for this struct was generated from the following file: diff --git a/docs/html/structuvgrtp_1_1frame_1_1rtcp__report__block.html b/docs/html/structuvgrtp_1_1frame_1_1rtcp__report__block.html index 7067c92..ef11505 100644 --- a/docs/html/structuvgrtp_1_1frame_1_1rtcp__report__block.html +++ b/docs/html/structuvgrtp_1_1frame_1_1rtcp__report__block.html @@ -221,7 +221,7 @@ Public Attributes
    The documentation for this struct was generated from the following file: diff --git a/docs/html/structuvgrtp_1_1frame_1_1rtcp__sdes__chunk.html b/docs/html/structuvgrtp_1_1frame_1_1rtcp__sdes__chunk.html index 99a2a8d..10947c3 100644 --- a/docs/html/structuvgrtp_1_1frame_1_1rtcp__sdes__chunk.html +++ b/docs/html/structuvgrtp_1_1frame_1_1rtcp__sdes__chunk.html @@ -131,7 +131,7 @@ Public Attributes
    The documentation for this struct was generated from the following file: diff --git a/docs/html/structuvgrtp_1_1frame_1_1rtcp__sdes__item.html b/docs/html/structuvgrtp_1_1frame_1_1rtcp__sdes__item.html index 848e711..b80607e 100644 --- a/docs/html/structuvgrtp_1_1frame_1_1rtcp__sdes__item.html +++ b/docs/html/structuvgrtp_1_1frame_1_1rtcp__sdes__item.html @@ -149,7 +149,7 @@ Public Attributes
    The documentation for this struct was generated from the following file: diff --git a/docs/html/structuvgrtp_1_1frame_1_1rtcp__sdes__packet.html b/docs/html/structuvgrtp_1_1frame_1_1rtcp__sdes__packet.html index 1bbba74..722b594 100644 --- a/docs/html/structuvgrtp_1_1frame_1_1rtcp__sdes__packet.html +++ b/docs/html/structuvgrtp_1_1frame_1_1rtcp__sdes__packet.html @@ -131,7 +131,7 @@ Public Attributes
    The documentation for this struct was generated from the following file: diff --git a/docs/html/structuvgrtp_1_1frame_1_1rtcp__sender__info.html b/docs/html/structuvgrtp_1_1frame_1_1rtcp__sender__info.html index 6edd44a..db53e3c 100644 --- a/docs/html/structuvgrtp_1_1frame_1_1rtcp__sender__info.html +++ b/docs/html/structuvgrtp_1_1frame_1_1rtcp__sender__info.html @@ -197,7 +197,7 @@ Public Attributes
    The documentation for this struct was generated from the following file: diff --git a/docs/html/structuvgrtp_1_1frame_1_1rtcp__sender__report.html b/docs/html/structuvgrtp_1_1frame_1_1rtcp__sender__report.html index 797b34d..2dc19f5 100644 --- a/docs/html/structuvgrtp_1_1frame_1_1rtcp__sender__report.html +++ b/docs/html/structuvgrtp_1_1frame_1_1rtcp__sender__report.html @@ -167,7 +167,7 @@ Public Attributes
    The documentation for this struct was generated from the following file: diff --git a/docs/html/structuvgrtp_1_1frame_1_1rtp__frame.html b/docs/html/structuvgrtp_1_1frame_1_1rtp__frame.html index 950f6e3..c289368 100644 --- a/docs/html/structuvgrtp_1_1frame_1_1rtp__frame.html +++ b/docs/html/structuvgrtp_1_1frame_1_1rtp__frame.html @@ -207,7 +207,7 @@ Public Attributes
    The documentation for this struct was generated from the following file: diff --git a/docs/html/util_8hh.html b/docs/html/util_8hh.html index eb9746c..5155e6f 100644 --- a/docs/html/util_8hh.html +++ b/docs/html/util_8hh.html @@ -5,7 +5,7 @@ -uvgRTP: C:/Local/rasane22/Projects/Kvazzup/libraries/uvgRTP/include/uvgrtp/util.hh File Reference +uvgRTP: util.hh File Reference @@ -237,11 +237,13 @@ Enumerations ,
      RCE_SRTP_KEYSIZE_256 = 1 << 16 ,
    -  RCE_ZRTP_MULTISTREAM_NO_DH = 1 << 17 +  RCE_ZRTP_DIFFIE_HELLMAN_MODE = 1 << 17 ,
    -  RCE_FRAME_RATE = 1 << 18 +  RCE_ZRTP_MULTISTREAM_MODE = 1 << 18 ,
    -  RCE_PACE_FRAGMENT_SENDING = 1 << 19 +  RCE_FRAME_RATE = 1 << 19 +,
    +  RCE_PACE_FRAGMENT_SENDING = 1 << 20
    }  RTP context enable flags. More...
    @@ -327,7 +329,7 @@ thread_local rtp_error_t r -

    Definition at line 287 of file util.hh.

    +

    Definition at line 291 of file util.hh.

    @@ -388,7 +390,9 @@ thread_local rtp_error_t r RCE_SRTP_KEYSIZE_256 

    Use 256-bit keys with SRTP, only user key management is supported

    -RCE_ZRTP_MULTISTREAM_NO_DH 

    Select which ZRTP stream does not perform Diffie-Hellman negotiation

    +RCE_ZRTP_DIFFIE_HELLMAN_MODE 

    Select which ZRTP stream performs the Diffie-Hellman exchange (default)

    + +RCE_ZRTP_MULTISTREAM_MODE 

    Select which ZRTP stream does not perform Diffie-Hellman exchange

    RCE_FRAME_RATE 

    Force uvgRTP to send packets at certain framerate (default 30 fps)

    diff --git a/docs/html/util_8hh_source.html b/docs/html/util_8hh_source.html index 799c8ec..0cb21fe 100644 --- a/docs/html/util_8hh_source.html +++ b/docs/html/util_8hh_source.html @@ -5,7 +5,7 @@ -uvgRTP: C:/Local/rasane22/Projects/Kvazzup/libraries/uvgRTP/include/uvgrtp/util.hh Source File +uvgRTP: util.hh Source File @@ -220,96 +220,100 @@ $(function() {
    179 RCE_H26X_DO_NOT_PREPEND_SC = 1 << 6,
    180 RCE_FRAMERATE = 1 << 18,
    181 RCE_FRAGMENT_PACING = 1 << 19,
    -
    183
    -
    184 // These can be used to specify what the address does for one address create session
    -
    185 RCE_SEND_ONLY = 1 << 1,
    -
    186 RCE_RECEIVE_ONLY = 1 << 2,
    -
    187
    -
    189 RCE_SRTP = 1 << 3,
    -
    190
    -
    199 RCE_SRTP_KMNGMNT_ZRTP = 1 << 4,
    -
    200
    -
    209 RCE_SRTP_KMNGMNT_USER = 1 << 5,
    -
    210
    +
    182 RCE_ZRTP_MULTISTREAM_NO_DH = 1 << 17,
    +
    184
    +
    185 // These can be used to specify what the address does for one address create session
    +
    186 RCE_SEND_ONLY = 1 << 1,
    +
    187 RCE_RECEIVE_ONLY = 1 << 2,
    +
    188
    +
    190 RCE_SRTP = 1 << 3,
    +
    191
    +
    200 RCE_SRTP_KMNGMNT_ZRTP = 1 << 4,
    +
    201
    +
    210 RCE_SRTP_KMNGMNT_USER = 1 << 5,
    211
    -
    215 RCE_NO_H26X_PREPEND_SC = 1 << 6,
    -
    216
    -
    219 RCE_H26X_DEPENDENCY_ENFORCEMENT = 1 << 7,
    -
    220
    -
    227 RCE_FRAGMENT_GENERIC = 1 << 8,
    -
    228
    -
    233 RCE_SYSTEM_CALL_CLUSTERING = 1 << 9,
    -
    234
    -
    236 RCE_SRTP_NULL_CIPHER = 1 << 10,
    -
    237
    -
    244 RCE_SRTP_AUTHENTICATE_RTP = 1 << 11,
    -
    245
    -
    247 RCE_SRTP_REPLAY_PROTECTION = 1 << 12,
    -
    248
    -
    251 RCE_RTCP = 1 << 13,
    -
    252
    -
    257 RCE_HOLEPUNCH_KEEPALIVE = 1 << 14,
    -
    258
    -
    260 RCE_SRTP_KEYSIZE_192 = 1 << 15,
    -
    261
    -
    263 RCE_SRTP_KEYSIZE_256 = 1 << 16,
    -
    264
    -
    266 RCE_ZRTP_MULTISTREAM_NO_DH = 1 << 17,
    -
    267
    -
    269 RCE_FRAME_RATE = 1 << 18,
    -
    270
    -
    272 RCE_PACE_FRAGMENT_SENDING = 1 << 19,
    -
    273
    -
    275 RCE_LAST = 1 << 20
    -
    277}; // maximum is 1 << 30 for int
    -
    278
    -
    279
    -
    287enum RTP_CTX_CONFIGURATION_FLAGS {
    -
    289 RCC_NO_FLAGS = 0, // This flag has no purpose
    -
    290 RCC_FPS_ENUMERATOR = 8,
    -
    292
    -
    299 RCC_UDP_RCV_BUF_SIZE = 1,
    -
    300
    -
    307 RCC_UDP_SND_BUF_SIZE = 2,
    -
    308
    -
    315 RCC_RING_BUFFER_SIZE = 3,
    -
    316
    -
    323 RCC_PKT_MAX_DELAY = 4,
    -
    324
    -
    326 RCC_DYN_PAYLOAD_TYPE = 5,
    -
    327
    -
    329 RCC_CLOCK_RATE = 6,
    -
    330
    -
    339 RCC_MTU_SIZE = 7,
    -
    340
    -
    352 RCC_FPS_NUMERATOR = 8,
    -
    353
    -
    360 RCC_FPS_DENOMINATOR = 9,
    -
    362 RCC_LAST
    -
    364};
    -
    365
    -
    366extern thread_local rtp_error_t rtp_errno;
    +
    212
    +
    216 RCE_NO_H26X_PREPEND_SC = 1 << 6,
    +
    217
    +
    220 RCE_H26X_DEPENDENCY_ENFORCEMENT = 1 << 7,
    +
    221
    +
    228 RCE_FRAGMENT_GENERIC = 1 << 8,
    +
    229
    +
    234 RCE_SYSTEM_CALL_CLUSTERING = 1 << 9,
    +
    235
    +
    237 RCE_SRTP_NULL_CIPHER = 1 << 10,
    +
    238
    +
    245 RCE_SRTP_AUTHENTICATE_RTP = 1 << 11,
    +
    246
    +
    248 RCE_SRTP_REPLAY_PROTECTION = 1 << 12,
    +
    249
    +
    252 RCE_RTCP = 1 << 13,
    +
    253
    +
    258 RCE_HOLEPUNCH_KEEPALIVE = 1 << 14,
    +
    259
    +
    261 RCE_SRTP_KEYSIZE_192 = 1 << 15,
    +
    262
    +
    264 RCE_SRTP_KEYSIZE_256 = 1 << 16,
    +
    265
    +
    267 RCE_ZRTP_DIFFIE_HELLMAN_MODE = 1 << 17,
    +
    268
    +
    270 RCE_ZRTP_MULTISTREAM_MODE = 1 << 18,
    +
    271
    +
    273 RCE_FRAME_RATE = 1 << 19,
    +
    274
    +
    276 RCE_PACE_FRAGMENT_SENDING = 1 << 20,
    +
    277
    +
    279 RCE_LAST = 1 << 21
    +
    281}; // maximum is 1 << 30 for int
    +
    282
    +
    283
    +
    291enum RTP_CTX_CONFIGURATION_FLAGS {
    +
    293 RCC_NO_FLAGS = 0, // This flag has no purpose
    +
    294 RCC_FPS_ENUMERATOR = 8,
    +
    296
    +
    303 RCC_UDP_RCV_BUF_SIZE = 1,
    +
    304
    +
    311 RCC_UDP_SND_BUF_SIZE = 2,
    +
    312
    +
    319 RCC_RING_BUFFER_SIZE = 3,
    +
    320
    +
    327 RCC_PKT_MAX_DELAY = 4,
    +
    328
    +
    330 RCC_DYN_PAYLOAD_TYPE = 5,
    +
    331
    +
    333 RCC_CLOCK_RATE = 6,
    +
    334
    +
    343 RCC_MTU_SIZE = 7,
    +
    344
    +
    356 RCC_FPS_NUMERATOR = 8,
    +
    357
    +
    364 RCC_FPS_DENOMINATOR = 9,
    +
    366 RCC_LAST
    +
    368};
    +
    369
    +
    370extern thread_local rtp_error_t rtp_errno;
    RTP_CTX_ENABLE_FLAGS
    RTP_CTX_ENABLE_FLAGS
    RTP context enable flags.
    Definition: util.hh:164
    -
    RCE_H26X_DEPENDENCY_ENFORCEMENT
    @ RCE_H26X_DEPENDENCY_ENFORCEMENT
    Definition: util.hh:219
    -
    RCE_SRTP_KEYSIZE_256
    @ RCE_SRTP_KEYSIZE_256
    Definition: util.hh:263
    -
    RCE_ZRTP_MULTISTREAM_NO_DH
    @ RCE_ZRTP_MULTISTREAM_NO_DH
    Definition: util.hh:266
    -
    RCE_SRTP_KMNGMNT_ZRTP
    @ RCE_SRTP_KMNGMNT_ZRTP
    Definition: util.hh:199
    -
    RCE_SRTP_KMNGMNT_USER
    @ RCE_SRTP_KMNGMNT_USER
    Definition: util.hh:209
    +
    RCE_H26X_DEPENDENCY_ENFORCEMENT
    @ RCE_H26X_DEPENDENCY_ENFORCEMENT
    Definition: util.hh:220
    +
    RCE_SRTP_KEYSIZE_256
    @ RCE_SRTP_KEYSIZE_256
    Definition: util.hh:264
    +
    RCE_SRTP_KMNGMNT_ZRTP
    @ RCE_SRTP_KMNGMNT_ZRTP
    Definition: util.hh:200
    +
    RCE_SRTP_KMNGMNT_USER
    @ RCE_SRTP_KMNGMNT_USER
    Definition: util.hh:210
    RCE_NO_FLAGS
    @ RCE_NO_FLAGS
    Use this if you have no RCE flags.
    Definition: util.hh:165
    -
    RCE_SRTP_NULL_CIPHER
    @ RCE_SRTP_NULL_CIPHER
    Definition: util.hh:236
    -
    RCE_FRAGMENT_GENERIC
    @ RCE_FRAGMENT_GENERIC
    Definition: util.hh:227
    -
    RCE_SEND_ONLY
    @ RCE_SEND_ONLY
    address/port interpreted as remote, no binding to local socket
    Definition: util.hh:185
    -
    RCE_SRTP_AUTHENTICATE_RTP
    @ RCE_SRTP_AUTHENTICATE_RTP
    Definition: util.hh:244
    -
    RCE_PACE_FRAGMENT_SENDING
    @ RCE_PACE_FRAGMENT_SENDING
    Definition: util.hh:272
    -
    RCE_NO_H26X_PREPEND_SC
    @ RCE_NO_H26X_PREPEND_SC
    Definition: util.hh:215
    -
    RCE_HOLEPUNCH_KEEPALIVE
    @ RCE_HOLEPUNCH_KEEPALIVE
    Definition: util.hh:257
    -
    RCE_SYSTEM_CALL_CLUSTERING
    @ RCE_SYSTEM_CALL_CLUSTERING
    Definition: util.hh:233
    -
    RCE_RTCP
    @ RCE_RTCP
    Definition: util.hh:251
    -
    RCE_SRTP_REPLAY_PROTECTION
    @ RCE_SRTP_REPLAY_PROTECTION
    Definition: util.hh:247
    -
    RCE_FRAME_RATE
    @ RCE_FRAME_RATE
    Definition: util.hh:269
    -
    RCE_SRTP_KEYSIZE_192
    @ RCE_SRTP_KEYSIZE_192
    Definition: util.hh:260
    -
    RCE_SRTP
    @ RCE_SRTP
    Definition: util.hh:189
    -
    RCE_RECEIVE_ONLY
    @ RCE_RECEIVE_ONLY
    address/port interpreted as local, sending not possible
    Definition: util.hh:186
    +
    RCE_SRTP_NULL_CIPHER
    @ RCE_SRTP_NULL_CIPHER
    Definition: util.hh:237
    +
    RCE_ZRTP_DIFFIE_HELLMAN_MODE
    @ RCE_ZRTP_DIFFIE_HELLMAN_MODE
    Definition: util.hh:267
    +
    RCE_FRAGMENT_GENERIC
    @ RCE_FRAGMENT_GENERIC
    Definition: util.hh:228
    +
    RCE_SEND_ONLY
    @ RCE_SEND_ONLY
    address/port interpreted as remote, no binding to local socket
    Definition: util.hh:186
    +
    RCE_SRTP_AUTHENTICATE_RTP
    @ RCE_SRTP_AUTHENTICATE_RTP
    Definition: util.hh:245
    +
    RCE_PACE_FRAGMENT_SENDING
    @ RCE_PACE_FRAGMENT_SENDING
    Definition: util.hh:276
    +
    RCE_NO_H26X_PREPEND_SC
    @ RCE_NO_H26X_PREPEND_SC
    Definition: util.hh:216
    +
    RCE_HOLEPUNCH_KEEPALIVE
    @ RCE_HOLEPUNCH_KEEPALIVE
    Definition: util.hh:258
    +
    RCE_ZRTP_MULTISTREAM_MODE
    @ RCE_ZRTP_MULTISTREAM_MODE
    Definition: util.hh:270
    +
    RCE_SYSTEM_CALL_CLUSTERING
    @ RCE_SYSTEM_CALL_CLUSTERING
    Definition: util.hh:234
    +
    RCE_RTCP
    @ RCE_RTCP
    Definition: util.hh:252
    +
    RCE_SRTP_REPLAY_PROTECTION
    @ RCE_SRTP_REPLAY_PROTECTION
    Definition: util.hh:248
    +
    RCE_FRAME_RATE
    @ RCE_FRAME_RATE
    Definition: util.hh:273
    +
    RCE_SRTP_KEYSIZE_192
    @ RCE_SRTP_KEYSIZE_192
    Definition: util.hh:261
    +
    RCE_SRTP
    @ RCE_SRTP
    Definition: util.hh:190
    +
    RCE_RECEIVE_ONLY
    @ RCE_RECEIVE_ONLY
    address/port interpreted as local, sending not possible
    Definition: util.hh:187
    RTP_FORMAT
    RTP_FORMAT
    These flags are given to uvgrtp::session::create_stream()
    Definition: util.hh:62
    RTP_FORMAT_H266
    @ RTP_FORMAT_H266
    H.266/VVC.
    Definition: util.hh:126
    RTP_FORMAT_G728
    @ RTP_FORMAT_G728
    G728.
    Definition: util.hh:82
    @@ -355,16 +359,16 @@ $(function() {
    RTP_MEMORY_ERROR
    @ RTP_MEMORY_ERROR
    Memory allocation failed.
    Definition: util.hh:46
    RTP_TIMEOUT
    @ RTP_TIMEOUT
    Operation timed out.
    Definition: util.hh:52
    RTP_GENERIC_ERROR
    @ RTP_GENERIC_ERROR
    Generic error condition.
    Definition: util.hh:41
    -
    RTP_CTX_CONFIGURATION_FLAGS
    RTP_CTX_CONFIGURATION_FLAGS
    RTP context configuration flags.
    Definition: util.hh:287
    -
    RCC_FPS_NUMERATOR
    @ RCC_FPS_NUMERATOR
    Definition: util.hh:352
    -
    RCC_PKT_MAX_DELAY
    @ RCC_PKT_MAX_DELAY
    Definition: util.hh:323
    -
    RCC_MTU_SIZE
    @ RCC_MTU_SIZE
    Definition: util.hh:339
    -
    RCC_RING_BUFFER_SIZE
    @ RCC_RING_BUFFER_SIZE
    Definition: util.hh:315
    -
    RCC_FPS_DENOMINATOR
    @ RCC_FPS_DENOMINATOR
    Definition: util.hh:360
    -
    RCC_UDP_RCV_BUF_SIZE
    @ RCC_UDP_RCV_BUF_SIZE
    Definition: util.hh:299
    -
    RCC_DYN_PAYLOAD_TYPE
    @ RCC_DYN_PAYLOAD_TYPE
    Definition: util.hh:326
    -
    RCC_UDP_SND_BUF_SIZE
    @ RCC_UDP_SND_BUF_SIZE
    Definition: util.hh:307
    -
    RCC_CLOCK_RATE
    @ RCC_CLOCK_RATE
    Definition: util.hh:329
    +
    RTP_CTX_CONFIGURATION_FLAGS
    RTP_CTX_CONFIGURATION_FLAGS
    RTP context configuration flags.
    Definition: util.hh:291
    +
    RCC_FPS_NUMERATOR
    @ RCC_FPS_NUMERATOR
    Definition: util.hh:356
    +
    RCC_PKT_MAX_DELAY
    @ RCC_PKT_MAX_DELAY
    Definition: util.hh:327
    +
    RCC_MTU_SIZE
    @ RCC_MTU_SIZE
    Definition: util.hh:343
    +
    RCC_RING_BUFFER_SIZE
    @ RCC_RING_BUFFER_SIZE
    Definition: util.hh:319
    +
    RCC_FPS_DENOMINATOR
    @ RCC_FPS_DENOMINATOR
    Definition: util.hh:364
    +
    RCC_UDP_RCV_BUF_SIZE
    @ RCC_UDP_RCV_BUF_SIZE
    Definition: util.hh:303
    +
    RCC_DYN_PAYLOAD_TYPE
    @ RCC_DYN_PAYLOAD_TYPE
    Definition: util.hh:330
    +
    RCC_UDP_SND_BUF_SIZE
    @ RCC_UDP_SND_BUF_SIZE
    Definition: util.hh:311
    +
    RCC_CLOCK_RATE
    @ RCC_CLOCK_RATE
    Definition: util.hh:333
    RTP_FLAGS
    RTP_FLAGS
    These flags are given to uvgrtp::media_stream::push_frame() and they can be OR'ed together.
    Definition: util.hh:136
    RTP_NO_FLAGS
    @ RTP_NO_FLAGS
    Use this if you have no RTP flags.
    Definition: util.hh:137
    RTP_COPY
    @ RTP_COPY
    Definition: util.hh:146
    diff --git a/docs/html/version_8hh_source.html b/docs/html/version_8hh_source.html index 4e296b0..896fecf 100644 --- a/docs/html/version_8hh_source.html +++ b/docs/html/version_8hh_source.html @@ -5,7 +5,7 @@ -uvgRTP: C:/Local/rasane22/Projects/Kvazzup/libraries/uvgRTP/include/uvgrtp/version.hh Source File +uvgRTP: version.hh Source File diff --git a/docs/html/wrapper__c_8hh_source.html b/docs/html/wrapper__c_8hh_source.html index 68101ce..81dd266 100644 --- a/docs/html/wrapper__c_8hh_source.html +++ b/docs/html/wrapper__c_8hh_source.html @@ -5,7 +5,7 @@ -uvgRTP: C:/Local/rasane22/Projects/Kvazzup/libraries/uvgRTP/include/uvgrtp/wrapper_c.hh Source File +uvgRTP: wrapper_c.hh Source File diff --git a/examples/zrtp_multistream.cc b/examples/zrtp_multistream.cc index 48df080..b3e10e2 100644 --- a/examples/zrtp_multistream.cc +++ b/examples/zrtp_multistream.cc @@ -73,14 +73,14 @@ int main(void) * before the actual media communication starts */ // Enable SRTP and use ZRTP to manage keys for both sender and receiver*/ - unsigned rce_flags = RCE_SRTP | RCE_SRTP_KMNGMNT_ZRTP; - unsigned rce_no_dh_flags = RCE_SRTP | RCE_SRTP_KMNGMNT_ZRTP | RCE_ZRTP_MULTISTREAM_NO_DH; + unsigned rce_dh_flags = RCE_SRTP | RCE_SRTP_KMNGMNT_ZRTP | RCE_ZRTP_DIFFIE_HELLMAN_MODE; + unsigned rce_multistream_flags = RCE_SRTP | RCE_SRTP_KMNGMNT_ZRTP | RCE_ZRTP_MULTISTREAM_MODE; // start the receivers in a separate thread - std::thread a_receiver(receive_function, receiver_session, rce_flags, print_mutex, + std::thread a_receiver(receive_function, receiver_session, rce_dh_flags, print_mutex, RTP_FORMAT_OPUS, RECEIVER_AUDIO_PORT, SENDER_AUDIO_PORT); - std::thread v_receiver(receive_function, receiver_session, rce_no_dh_flags, print_mutex, + std::thread v_receiver(receive_function, receiver_session, rce_multistream_flags, print_mutex, RTP_FORMAT_H265, RECEIVER_VIDEO_PORT, SENDER_VIDEO_PORT); @@ -89,11 +89,11 @@ int main(void) uvgrtp::session *sender_session = sender_ctx.create_session(RECEIVER_ADDRESS, SENDER_ADDRESS); // start the senders in their own threads - std::thread a_sender(sender_function, sender_session, rce_flags, print_mutex, + std::thread a_sender(sender_function, sender_session, rce_dh_flags, print_mutex, RTP_FORMAT_OPUS, SENDER_AUDIO_PORT, RECEIVER_AUDIO_PORT, AUDIO_PAYLOAD_SIZE, AUDIO_FRAME_INTERVAL_MS); - std::thread v_sender(sender_function, sender_session, rce_no_dh_flags, print_mutex, + std::thread v_sender(sender_function, sender_session, rce_multistream_flags, print_mutex, RTP_FORMAT_H265, SENDER_VIDEO_PORT, RECEIVER_VIDEO_PORT, VIDEO_PAYLOAD_SIZE, VIDEO_FRAME_INTERVAL_MS); diff --git a/include/uvgrtp/util.hh b/include/uvgrtp/util.hh index c930817..a5afecd 100644 --- a/include/uvgrtp/util.hh +++ b/include/uvgrtp/util.hh @@ -179,6 +179,7 @@ enum RTP_CTX_ENABLE_FLAGS { RCE_H26X_DO_NOT_PREPEND_SC = 1 << 6, ///< renamed flag, use RCE_NO_H26X_PREPEND_SC instead RCE_FRAMERATE = 1 << 18, ///< renamed flag, use RCE_FRAME_RATE instead RCE_FRAGMENT_PACING = 1 << 19, ///< renamed flag, use RCE_PACE_FRAGMENT_SENDING instead + RCE_ZRTP_MULTISTREAM_NO_DH = 1 << 17, ///< renamed flag, use RCE_ZRTP_MULTISTREAM_MODE instead /// \endcond // These can be used to specify what the address does for one address create session @@ -262,17 +263,20 @@ enum RTP_CTX_ENABLE_FLAGS { /** Use 256-bit keys with SRTP, only user key management is supported */ RCE_SRTP_KEYSIZE_256 = 1 << 16, - /** Select which ZRTP stream does not perform Diffie-Hellman negotiation */ - RCE_ZRTP_MULTISTREAM_NO_DH = 1 << 17, + /** Select which ZRTP stream performs the Diffie-Hellman exchange (default) */ + RCE_ZRTP_DIFFIE_HELLMAN_MODE = 1 << 17, + + /** Select which ZRTP stream does not perform Diffie-Hellman exchange */ + RCE_ZRTP_MULTISTREAM_MODE = 1 << 18, /** Force uvgRTP to send packets at certain framerate (default 30 fps) */ - RCE_FRAME_RATE = 1 << 18, + RCE_FRAME_RATE = 1 << 19, /** Paces the sending of frame fragments within frame interval (default 1/30 s) */ - RCE_PACE_FRAGMENT_SENDING = 1 << 19, + RCE_PACE_FRAGMENT_SENDING = 1 << 20, /// \cond DO_NOT_DOCUMENT - RCE_LAST = 1 << 20 + RCE_LAST = 1 << 21 /// \endcond }; // maximum is 1 << 30 for int diff --git a/src/media_stream.cc b/src/media_stream.cc index 7face71..f67cf39 100644 --- a/src/media_stream.cc +++ b/src/media_stream.cc @@ -279,7 +279,7 @@ rtp_error_t uvgrtp::media_stream::init(std::shared_ptr zrtp) rtp_ = std::shared_ptr (new uvgrtp::rtp(fmt_)); - bool perform_dh = !(rce_flags_ & RCE_ZRTP_MULTISTREAM_NO_DH); + bool perform_dh = !(rce_flags_ & RCE_ZRTP_MULTISTREAM_MODE); if (!perform_dh) { UVG_LOG_DEBUG("Sleeping non-DH performing stream until DH has finished"); diff --git a/src/session.cc b/src/session.cc index 5844b0b..b458e35 100644 --- a/src/session.cc +++ b/src/session.cc @@ -123,6 +123,12 @@ uvgrtp::media_stream* uvgrtp::session::create_stream(uint16_t src_port, uint16_t return nullptr; } + if (!(rce_flags & RCE_ZRTP_DIFFIE_HELLMAN_MODE) && + !(rce_flags & RCE_ZRTP_MULTISTREAM_MODE)) { + UVG_LOG_INFO("ZRTP mode not selected, using Diffie-Hellman mode"); + rce_flags |= RCE_ZRTP_DIFFIE_HELLMAN_MODE; + } + session_mtx_.lock(); if (!zrtp_) { zrtp_ = std::shared_ptr (new uvgrtp::zrtp()); diff --git a/src/zrtp.cc b/src/zrtp.cc index 77444ca..f6f12f3 100644 --- a/src/zrtp.cc +++ b/src/zrtp.cc @@ -667,7 +667,7 @@ rtp_error_t uvgrtp::zrtp::init(uint32_t ssrc, std::shared_ptr so if (initialized_) { - UVG_LOG_WARN("ZRTP multistream mode not used. Please use RCE_ZRTP_MULTISTREAM_NO_DH flag " \ + UVG_LOG_WARN("ZRTP multistream mode not used. Please use RCE_ZRTP_MULTISTREAM_MODE flag " \ "to select which streams should not perform DH"); } diff --git a/test/test_5_srtp_zrtp.cpp b/test/test_5_srtp_zrtp.cpp index a503673..e3af938 100644 --- a/test/test_5_srtp_zrtp.cpp +++ b/test/test_5_srtp_zrtp.cpp @@ -257,26 +257,25 @@ TEST(EncryptionTests, zrtp_multistream) } /* Enable SRTP and ZRTP */ - unsigned zrtp_flags = RCE_SRTP | RCE_SRTP_KMNGMNT_ZRTP; + unsigned zrtp_dh_flags = RCE_SRTP | RCE_SRTP_KMNGMNT_ZRTP | RCE_ZRTP_DIFFIE_HELLMAN_MODE; // only one of the streams should perform DH - unsigned int no_dh_flags = zrtp_flags | RCE_ZRTP_MULTISTREAM_NO_DH; - + unsigned int zrtp_multistream_flags = RCE_SRTP | RCE_SRTP_KMNGMNT_ZRTP | RCE_ZRTP_MULTISTREAM_MODE; uvgrtp::session* sender_session = ctx.create_session(RECEIVER_ADDRESS, SENDER_ADDRESS); uvgrtp::session* receiver_session = ctx.create_session(SENDER_ADDRESS, RECEIVER_ADDRESS); std::unique_ptr sender_thread1 = - std::unique_ptr(new std::thread(zrtp_sender_func, sender_session, SENDER_PORT + 2, RECEIVER_PORT + 2, zrtp_flags)); + std::unique_ptr(new std::thread(zrtp_sender_func, sender_session, SENDER_PORT + 2, RECEIVER_PORT + 2, zrtp_dh_flags)); std::unique_ptr receiver_thread1 = - std::unique_ptr(new std::thread(zrtp_receive_func, receiver_session, SENDER_PORT + 2, RECEIVER_PORT + 2, zrtp_flags)); + std::unique_ptr(new std::thread(zrtp_receive_func, receiver_session, SENDER_PORT + 2, RECEIVER_PORT + 2, zrtp_dh_flags)); std::unique_ptr sender_thread2 = - std::unique_ptr(new std::thread(zrtp_sender_func, sender_session, SENDER_PORT + 4, RECEIVER_PORT + 4, no_dh_flags)); + std::unique_ptr(new std::thread(zrtp_sender_func, sender_session, SENDER_PORT + 4, RECEIVER_PORT + 4, zrtp_multistream_flags)); std::unique_ptr receiver_thread2 = - std::unique_ptr(new std::thread(zrtp_receive_func, receiver_session, SENDER_PORT + 4, RECEIVER_PORT + 4, no_dh_flags)); + std::unique_ptr(new std::thread(zrtp_receive_func, receiver_session, SENDER_PORT + 4, RECEIVER_PORT + 4, zrtp_multistream_flags)); if (receiver_thread1 && receiver_thread1->joinable()) {