Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
ZLMediaKit
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
张翔宇
ZLMediaKit
Commits
8c460bfc
Commit
8c460bfc
authored
Apr 02, 2021
by
xiongziliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
基本完成rtc转rtsp
parent
dc485c62
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
184 行增加
和
8 行删除
+184
-8
webrtc/Sdp.cpp
+74
-4
webrtc/Sdp.h
+7
-1
webrtc/WebRtcTransport.cpp
+86
-2
webrtc/WebRtcTransport.h
+17
-1
没有找到文件。
webrtc/Sdp.cpp
查看文件 @
8c460bfc
...
@@ -923,9 +923,74 @@ std::shared_ptr<SdpItem> wrapSdpAttr(SdpItem::Ptr item){
...
@@ -923,9 +923,74 @@ std::shared_ptr<SdpItem> wrapSdpAttr(SdpItem::Ptr item){
return
ret
;
return
ret
;
}
}
string
RtcSession
::
toString
()
const
{
static
void
toRtsp
(
vector
<
SdpItem
::
Ptr
>
&
items
)
{
for
(
auto
it
=
items
.
begin
();
it
!=
items
.
end
();)
{
switch
((
*
it
)
->
getKey
()[
0
])
{
case
'v'
:
case
'o'
:
case
's'
:
case
'i'
:
case
't'
:
case
'c'
:
case
'b'
:{
++
it
;
break
;
}
case
'm'
:
{
auto
m
=
dynamic_pointer_cast
<
SdpMedia
>
(
*
it
);
CHECK
(
m
);
m
->
proto
=
"RTP/AVP"
;
++
it
;
break
;
}
case
'a'
:
{
auto
attr
=
dynamic_pointer_cast
<
SdpAttr
>
(
*
it
);
CHECK
(
attr
);
if
(
!
strcasecmp
(
attr
->
detail
->
getKey
(),
"rtpmap"
)
||
!
strcasecmp
(
attr
->
detail
->
getKey
(),
"fmtp"
))
{
++
it
;
break
;
}
}
default
:
{
it
=
items
.
erase
(
it
);
break
;
}
}
}
}
string
RtcSession
::
toRtspSdp
()
const
{
checkValid
();
checkValid
();
RtcSessionSdp
sdp
;
RtcSession
copy
=
*
this
;
copy
.
media
.
clear
();
for
(
auto
&
m
:
media
)
{
switch
(
m
.
type
)
{
case
TrackAudio
:
case
TrackVideo
:
{
copy
.
media
.
emplace_back
(
m
);
copy
.
media
.
back
().
plan
.
resize
(
1
);
break
;
}
default
:
continue
;
}
}
auto
sdp
=
copy
.
toRtcSessionSdp
();
toRtsp
(
sdp
->
items
);
int
i
=
0
;
for
(
auto
&
m
:
sdp
->
medias
)
{
toRtsp
(
m
.
items
);
m
.
items
.
push_back
(
wrapSdpAttr
(
std
::
make_shared
<
SdpCommon
>
(
"control"
,
string
(
"trackID="
)
+
to_string
(
i
++
))));
}
return
sdp
->
toString
();
}
RtcSessionSdp
::
Ptr
RtcSession
::
toRtcSessionSdp
()
const
{
RtcSessionSdp
::
Ptr
ret
=
std
::
make_shared
<
RtcSessionSdp
>
();
auto
&
sdp
=
*
ret
;
sdp
.
items
.
emplace_back
(
std
::
make_shared
<
SdpString
<
'v'
>
>
(
to_string
(
version
)));
sdp
.
items
.
emplace_back
(
std
::
make_shared
<
SdpString
<
'v'
>
>
(
to_string
(
version
)));
sdp
.
items
.
emplace_back
(
std
::
make_shared
<
SdpOrigin
>
(
origin
));
sdp
.
items
.
emplace_back
(
std
::
make_shared
<
SdpOrigin
>
(
origin
));
sdp
.
items
.
emplace_back
(
std
::
make_shared
<
SdpString
<
's'
>
>
(
session_name
));
sdp
.
items
.
emplace_back
(
std
::
make_shared
<
SdpString
<
's'
>
>
(
session_name
));
...
@@ -1076,7 +1141,12 @@ string RtcSession::toString() const{
...
@@ -1076,7 +1141,12 @@ string RtcSession::toString() const{
sdp_media
.
items
.
emplace_back
(
wrapSdpAttr
(
std
::
make_shared
<
SdpAttrCandidate
>
(
cand
)));
sdp_media
.
items
.
emplace_back
(
wrapSdpAttr
(
std
::
make_shared
<
SdpAttrCandidate
>
(
cand
)));
}
}
}
}
return
sdp
.
toString
();
return
ret
;
}
string
RtcSession
::
toString
()
const
{
checkValid
();
return
toRtcSessionSdp
()
->
toString
();
}
}
string
RtcCodecPlan
::
getFmtp
(
const
char
*
key
)
const
{
string
RtcCodecPlan
::
getFmtp
(
const
char
*
key
)
const
{
...
@@ -1146,7 +1216,7 @@ void RtcSession::checkValid() const{
...
@@ -1146,7 +1216,7 @@ void RtcSession::checkValid() const{
}
}
}
}
RtcMedia
*
RtcSession
::
getMedia
(
TrackType
type
)
{
const
RtcMedia
*
RtcSession
::
getMedia
(
TrackType
type
)
const
{
for
(
auto
&
m
:
media
){
for
(
auto
&
m
:
media
){
if
(
m
.
type
==
type
){
if
(
m
.
type
==
type
){
return
&
m
;
return
&
m
;
...
...
webrtc/Sdp.h
查看文件 @
8c460bfc
...
@@ -550,6 +550,8 @@ public:
...
@@ -550,6 +550,8 @@ public:
class
RtcSessionSdp
:
public
RtcSdpBase
{
class
RtcSessionSdp
:
public
RtcSdpBase
{
public
:
public
:
using
Ptr
=
std
::
shared_ptr
<
RtcSessionSdp
>
;
vector
<
RtcSdpBase
>
medias
;
vector
<
RtcSdpBase
>
medias
;
void
parse
(
const
string
&
str
);
void
parse
(
const
string
&
str
);
string
toString
()
const
override
;
string
toString
()
const
override
;
...
@@ -652,7 +654,11 @@ public:
...
@@ -652,7 +654,11 @@ public:
void
loadFrom
(
const
string
&
sdp
,
bool
check
=
true
);
void
loadFrom
(
const
string
&
sdp
,
bool
check
=
true
);
void
checkValid
()
const
;
void
checkValid
()
const
;
string
toString
()
const
;
string
toString
()
const
;
RtcMedia
*
getMedia
(
TrackType
type
);
string
toRtspSdp
()
const
;
const
RtcMedia
*
getMedia
(
TrackType
type
)
const
;
private
:
RtcSessionSdp
::
Ptr
toRtcSessionSdp
()
const
;
};
};
class
RtcConfigure
{
class
RtcConfigure
{
...
...
webrtc/WebRtcTransport.cpp
查看文件 @
8c460bfc
#include "WebRtcTransport.h"
#include "WebRtcTransport.h"
#include <iostream>
#include <iostream>
#include "Rtcp/Rtcp.h"
#include "Rtcp/Rtcp.h"
#include "Rtsp/RtpReceiver.h"
#define RTX_SSRC_OFFSET 2
#define RTP_CNAME "zlmediakit-rtp"
#define RTX_CNAME "zlmediakit-rtx"
WebRtcTransport
::
WebRtcTransport
(
const
EventPoller
::
Ptr
&
poller
)
{
WebRtcTransport
::
WebRtcTransport
(
const
EventPoller
::
Ptr
&
poller
)
{
_dtls_transport
=
std
::
make_shared
<
RTC
::
DtlsTransport
>
(
poller
,
this
);
_dtls_transport
=
std
::
make_shared
<
RTC
::
DtlsTransport
>
(
poller
,
this
);
...
@@ -51,7 +56,7 @@ void WebRtcTransport::OnDtlsTransportConnected(
...
@@ -51,7 +56,7 @@ void WebRtcTransport::OnDtlsTransportConnected(
std
::
string
&
remoteCert
)
{
std
::
string
&
remoteCert
)
{
InfoL
;
InfoL
;
_srtp_session_send
=
std
::
make_shared
<
RTC
::
SrtpSession
>
(
RTC
::
SrtpSession
::
Type
::
OUTBOUND
,
srtpCryptoSuite
,
srtpLocalKey
,
srtpLocalKeyLen
);
_srtp_session_send
=
std
::
make_shared
<
RTC
::
SrtpSession
>
(
RTC
::
SrtpSession
::
Type
::
OUTBOUND
,
srtpCryptoSuite
,
srtpLocalKey
,
srtpLocalKeyLen
);
_srtp_session_recv
=
std
::
make_shared
<
RTC
::
SrtpSession
>
(
RTC
::
SrtpSession
::
Type
::
OUT
BOUND
,
srtpCryptoSuite
,
srtpRemoteKey
,
srtpRemoteKeyLen
);
_srtp_session_recv
=
std
::
make_shared
<
RTC
::
SrtpSession
>
(
RTC
::
SrtpSession
::
Type
::
IN
BOUND
,
srtpCryptoSuite
,
srtpRemoteKey
,
srtpRemoteKeyLen
);
onStartWebRTC
();
onStartWebRTC
();
}
}
...
@@ -209,6 +214,29 @@ void WebRtcTransportImp::attach(const RtspMediaSource::Ptr &src) {
...
@@ -209,6 +214,29 @@ void WebRtcTransportImp::attach(const RtspMediaSource::Ptr &src) {
}
}
void
WebRtcTransportImp
::
onStartWebRTC
()
{
void
WebRtcTransportImp
::
onStartWebRTC
()
{
if
(
canRecvRtp
())
{
_push_src
=
std
::
make_shared
<
RtspMediaSourceImp
>
(
DEFAULT_VHOST
,
"live"
,
"push"
);
auto
rtsp_sdp
=
getSdp
(
SdpType
::
answer
).
toRtspSdp
();
_push_src
->
setSdp
(
rtsp_sdp
);
for
(
auto
&
m
:
getSdp
(
SdpType
::
offer
).
media
)
{
for
(
auto
&
plan
:
m
.
plan
)
{
auto
hit_pan
=
getSdp
(
SdpType
::
answer
).
getMedia
(
m
.
type
)
->
getPlan
(
plan
.
pt
);
if
(
!
hit_pan
)
{
continue
;
}
auto
&
ref
=
_rtp_receiver
[
plan
.
pt
];
ref
.
plan
=
&
plan
;
ref
.
media
=
&
m
;
ref
.
is_common_rtp
=
getCodecId
(
plan
.
codec
)
!=
CodecInvalid
;
ref
.
receiver
=
std
::
make_shared
<
RtpReceiverImp
>
([
&
ref
,
this
](
RtpPacket
::
Ptr
rtp
)
{
onSortedRtp
(
ref
,
std
::
move
(
rtp
));
},
[
ref
,
this
](
const
RtpPacket
::
Ptr
&
rtp
)
{
onBeforeSortedRtp
(
ref
,
rtp
);
});
}
}
}
if
(
!
canSendRtp
())
{
if
(
!
canSendRtp
())
{
return
;
return
;
}
}
...
@@ -244,6 +272,11 @@ bool WebRtcTransportImp::canSendRtp() const{
...
@@ -244,6 +272,11 @@ bool WebRtcTransportImp::canSendRtp() const{
return
sdp
.
media
[
0
].
direction
==
RtpDirection
::
sendrecv
||
sdp
.
media
[
0
].
direction
==
RtpDirection
::
sendonly
;
return
sdp
.
media
[
0
].
direction
==
RtpDirection
::
sendrecv
||
sdp
.
media
[
0
].
direction
==
RtpDirection
::
sendonly
;
}
}
bool
WebRtcTransportImp
::
canRecvRtp
()
const
{
auto
&
sdp
=
getSdp
(
SdpType
::
answer
);
return
sdp
.
media
[
0
].
direction
==
RtpDirection
::
sendrecv
||
sdp
.
media
[
0
].
direction
==
RtpDirection
::
recvonly
;
}
void
WebRtcTransportImp
::
onCheckSdp
(
SdpType
type
,
RtcSession
&
sdp
)
const
{
void
WebRtcTransportImp
::
onCheckSdp
(
SdpType
type
,
RtcSession
&
sdp
)
const
{
WebRtcTransport
::
onCheckSdp
(
type
,
sdp
);
WebRtcTransport
::
onCheckSdp
(
type
,
sdp
);
if
(
type
!=
SdpType
::
answer
||
!
canSendRtp
())
{
if
(
type
!=
SdpType
::
answer
||
!
canSendRtp
())
{
...
@@ -255,7 +288,12 @@ void WebRtcTransportImp::onCheckSdp(SdpType type, RtcSession &sdp) const{
...
@@ -255,7 +288,12 @@ void WebRtcTransportImp::onCheckSdp(SdpType type, RtcSession &sdp) const{
continue
;
continue
;
}
}
m
.
rtp_ssrc
.
ssrc
=
_src
->
getSsrc
(
m
.
type
);
m
.
rtp_ssrc
.
ssrc
=
_src
->
getSsrc
(
m
.
type
);
m
.
rtp_ssrc
.
cname
=
"zlmediakit-rtc"
;
m
.
rtp_ssrc
.
cname
=
RTP_CNAME
;
//todo 先屏蔽rtx,因为chrome报错
if
(
false
&&
m
.
getRelatedRtxPlan
(
m
.
plan
[
0
].
pt
))
{
m
.
rtx_ssrc
.
ssrc
=
RTX_SSRC_OFFSET
+
m
.
rtp_ssrc
.
ssrc
;
m
.
rtx_ssrc
.
cname
=
RTX_CNAME
;
}
auto
rtsp_media
=
_rtsp_send_sdp
.
getMedia
(
m
.
type
);
auto
rtsp_media
=
_rtsp_send_sdp
.
getMedia
(
m
.
type
);
if
(
rtsp_media
&&
getCodecId
(
rtsp_media
->
plan
[
0
].
codec
)
==
getCodecId
(
m
.
plan
[
0
].
codec
))
{
if
(
rtsp_media
&&
getCodecId
(
rtsp_media
->
plan
[
0
].
codec
)
==
getCodecId
(
m
.
plan
[
0
].
codec
))
{
_send_rtp_pt
[
m
.
type
]
=
m
.
plan
[
0
].
pt
;
_send_rtp_pt
[
m
.
type
]
=
m
.
plan
[
0
].
pt
;
...
@@ -309,14 +347,60 @@ SdpAttrCandidate::Ptr WebRtcTransportImp::getIceCandidate() const{
...
@@ -309,14 +347,60 @@ SdpAttrCandidate::Ptr WebRtcTransportImp::getIceCandidate() const{
return
candidate
;
return
candidate
;
}
}
class
RtpReceiverImp
:
public
RtpReceiver
{
public
:
RtpReceiverImp
(
function
<
void
(
RtpPacket
::
Ptr
rtp
)
>
cb
,
function
<
void
(
const
RtpPacket
::
Ptr
&
rtp
)
>
cb_before
=
nullptr
){
_on_sort
=
std
::
move
(
cb
);
_on_before_sort
=
std
::
move
(
cb_before
);
}
~
RtpReceiverImp
()
override
=
default
;
bool
inputRtp
(
TrackType
type
,
int
samplerate
,
uint8_t
*
ptr
,
size_t
len
){
return
handleOneRtp
((
int
)
type
,
type
,
samplerate
,
ptr
,
len
);
}
protected
:
void
onRtpSorted
(
RtpPacket
::
Ptr
rtp
,
int
track_index
)
override
{
_on_sort
(
std
::
move
(
rtp
));
}
void
onBeforeRtpSorted
(
const
RtpPacket
::
Ptr
&
rtp
,
int
track_index
)
override
{
if
(
_on_before_sort
)
{
_on_before_sort
(
rtp
);
}
}
private
:
function
<
void
(
RtpPacket
::
Ptr
rtp
)
>
_on_sort
;
function
<
void
(
const
RtpPacket
::
Ptr
&
rtp
)
>
_on_before_sort
;
};
void
WebRtcTransportImp
::
onRtp
(
const
char
*
buf
,
size_t
len
)
{
void
WebRtcTransportImp
::
onRtp
(
const
char
*
buf
,
size_t
len
)
{
RtpHeader
*
rtp
=
(
RtpHeader
*
)
buf
;
RtpHeader
*
rtp
=
(
RtpHeader
*
)
buf
;
auto
it
=
_rtp_receiver
.
find
(
rtp
->
pt
);
if
(
it
==
_rtp_receiver
.
end
())
{
WarnL
;
return
;
}
auto
&
info
=
it
->
second
;
info
.
receiver
->
inputRtp
(
info
.
media
->
type
,
info
.
plan
->
sample_rate
,
(
uint8_t
*
)
buf
,
len
);
}
}
void
WebRtcTransportImp
::
onRtcp
(
const
char
*
buf
,
size_t
len
)
{
void
WebRtcTransportImp
::
onRtcp
(
const
char
*
buf
,
size_t
len
)
{
RtcpHeader
*
rtcp
=
(
RtcpHeader
*
)
buf
;
RtcpHeader
*
rtcp
=
(
RtcpHeader
*
)
buf
;
}
}
void
WebRtcTransportImp
::
onSortedRtp
(
const
RtpPayloadInfo
&
info
,
RtpPacket
::
Ptr
rtp
)
{
if
(
!
info
.
is_common_rtp
){
WarnL
;
}
_push_src
->
onWrite
(
std
::
move
(
rtp
),
true
);
}
void
WebRtcTransportImp
::
onBeforeSortedRtp
(
const
RtpPayloadInfo
&
info
,
const
RtpPacket
::
Ptr
&
rtp
)
{
}
///////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////
...
...
webrtc/WebRtcTransport.h
查看文件 @
8c460bfc
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
#include "Sdp.h"
#include "Sdp.h"
#include "Poller/EventPoller.h"
#include "Poller/EventPoller.h"
#include "Network/Socket.h"
#include "Network/Socket.h"
#include "Rtsp/RtspMediaSource.h"
#include "Rtsp/RtspMediaSource
Imp
.h"
using
namespace
toolkit
;
using
namespace
toolkit
;
using
namespace
mediakit
;
using
namespace
mediakit
;
...
@@ -95,6 +95,8 @@ private:
...
@@ -95,6 +95,8 @@ private:
RtcSession
::
Ptr
_answer_sdp
;
RtcSession
::
Ptr
_answer_sdp
;
};
};
class
RtpReceiverImp
;
class
WebRtcTransportImp
:
public
WebRtcTransport
,
public
std
::
enable_shared_from_this
<
WebRtcTransportImp
>
{
class
WebRtcTransportImp
:
public
WebRtcTransport
,
public
std
::
enable_shared_from_this
<
WebRtcTransportImp
>
{
public
:
public
:
using
Ptr
=
std
::
shared_ptr
<
WebRtcTransportImp
>
;
using
Ptr
=
std
::
shared_ptr
<
WebRtcTransportImp
>
;
...
@@ -128,6 +130,18 @@ private:
...
@@ -128,6 +130,18 @@ private:
void
onSendRtp
(
const
RtpPacket
::
Ptr
&
rtp
,
bool
flush
);
void
onSendRtp
(
const
RtpPacket
::
Ptr
&
rtp
,
bool
flush
);
SdpAttrCandidate
::
Ptr
getIceCandidate
()
const
;
SdpAttrCandidate
::
Ptr
getIceCandidate
()
const
;
bool
canSendRtp
()
const
;
bool
canSendRtp
()
const
;
bool
canRecvRtp
()
const
;
class
RtpPayloadInfo
{
public
:
bool
is_common_rtp
;
const
RtcCodecPlan
*
plan
;
const
RtcMedia
*
media
;
std
::
shared_ptr
<
RtpReceiverImp
>
receiver
;
};
void
onSortedRtp
(
const
RtpPayloadInfo
&
info
,
RtpPacket
::
Ptr
rtp
);
void
onBeforeSortedRtp
(
const
RtpPayloadInfo
&
info
,
const
RtpPacket
::
Ptr
&
rtp
);
private
:
private
:
Socket
::
Ptr
_socket
;
Socket
::
Ptr
_socket
;
...
@@ -136,6 +150,8 @@ private:
...
@@ -136,6 +150,8 @@ private:
RtcSession
_answer_sdp
;
RtcSession
_answer_sdp
;
mutable
RtcSession
_rtsp_send_sdp
;
mutable
RtcSession
_rtsp_send_sdp
;
mutable
uint8_t
_send_rtp_pt
[
2
]
=
{
0
,
0
};
mutable
uint8_t
_send_rtp_pt
[
2
]
=
{
0
,
0
};
RtspMediaSourceImp
::
Ptr
_push_src
;
unordered_map
<
uint8_t
,
RtpPayloadInfo
>
_rtp_receiver
;
};
};
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论