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
820da438
Commit
820da438
authored
Oct 27, 2018
by
xiongziliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加MediaSink类,简化重复逻辑代码
parent
ce5c71c9
显示空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
274 行增加
和
173 行删除
+274
-173
src/Common/MediaSink.cpp
+87
-0
src/Common/MediaSink.h
+107
-0
src/Common/MultiMediaSourceMuxer.h
+1
-1
src/Device/PlayerProxy.cpp
+0
-3
src/Player/Frame.h
+29
-7
src/RtmpMuxer/RtmpMediaSourceMuxer.h
+1
-1
src/RtmpMuxer/RtmpMuxer.cpp
+13
-45
src/RtmpMuxer/RtmpMuxer.h
+9
-33
src/RtspMuxer/RtspMediaSourceMuxer.h
+1
-1
src/RtspMuxer/RtspMuxer.cpp
+16
-47
src/RtspMuxer/RtspMuxer.h
+10
-35
没有找到文件。
src/Common/MediaSink.cpp
0 → 100644
查看文件 @
820da438
/*
* MIT License
*
* Copyright (c) 2016 xiongziliang <771730766@qq.com>
*
* This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#include "MediaSink.h"
namespace
mediakit
{
void
MediaSink
::
addTrack
(
const
Track
::
Ptr
&
track_in
)
{
lock_guard
<
mutex
>
lck
(
_mtx
);
//克隆Track,只拷贝其数据,不拷贝其数据转发关系
auto
track
=
track_in
->
clone
();
weak_ptr
<
MediaSink
>
weakSelf
=
shared_from_this
();
track
->
addDelegate
(
std
::
make_shared
<
FrameWriterInterfaceHelper
>
([
weakSelf
](
const
Frame
::
Ptr
&
frame
){
auto
strongSelf
=
weakSelf
.
lock
();
if
(
!
strongSelf
){
return
;
}
if
(
strongSelf
->
_allTrackReady
){
strongSelf
->
onTrackFrame
(
frame
);
}
}));
auto
codec_id
=
track
->
getCodecId
();
_track_map
[
codec_id
]
=
track
;
auto
lam
=
[
this
,
track
](){
onTrackReady
(
track
);
};
if
(
track
->
ready
()){
lam
();
}
else
{
_allTrackReady
=
false
;
_trackReadyCallback
[
codec_id
]
=
lam
;
}
}
void
MediaSink
::
inputFrame
(
const
Frame
::
Ptr
&
frame
)
{
lock_guard
<
mutex
>
lck
(
_mtx
);
auto
codec_id
=
frame
->
getCodecId
();
auto
it
=
_track_map
.
find
(
codec_id
);
if
(
it
==
_track_map
.
end
())
{
return
;
}
it
->
second
->
inputFrame
(
frame
);
if
(
!
_allTrackReady
&&
!
_trackReadyCallback
.
empty
()
&&
it
->
second
->
ready
()){
//Track由未就绪状态装换成就绪状态,我们就生成sdp以及rtp编码器
auto
it_callback
=
_trackReadyCallback
.
find
(
codec_id
);
if
(
it_callback
!=
_trackReadyCallback
.
end
()){
it_callback
->
second
();
_trackReadyCallback
.
erase
(
it_callback
);
}
}
if
(
!
_allTrackReady
&&
_trackReadyCallback
.
empty
()){
_allTrackReady
=
true
;
onAllTrackReady
();
}
}
bool
MediaSink
::
isAllTrackReady
()
const
{
return
_allTrackReady
;
}
}
//namespace mediakit
src/Common/MediaSink.h
0 → 100644
查看文件 @
820da438
/*
* MIT License
*
* Copyright (c) 2016 xiongziliang <771730766@qq.com>
*
* This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#ifndef ZLMEDIAKIT_MEDIASINK_H
#define ZLMEDIAKIT_MEDIASINK_H
#include <mutex>
#include <memory>
#include "Player/Frame.h"
#include "Player/Track.h"
using
namespace
std
;
using
namespace
toolkit
;
namespace
mediakit
{
class
MediaSink
:
public
FrameWriterInterface
,
public
std
::
enable_shared_from_this
<
MediaSink
>
{
public
:
typedef
std
::
shared_ptr
<
MediaSink
>
Ptr
;
MediaSink
(){}
virtual
~
MediaSink
(){}
/**
* 输入frame
* @param frame
*/
void
inputFrame
(
const
Frame
::
Ptr
&
frame
)
override
;
/**
* 添加track,内部会调用Track的clone方法
* 只会克隆sps pps这些信息 ,而不会克隆Delegate相关关系
* @param track
*/
void
addTrack
(
const
Track
::
Ptr
&
track
);
/**
* 全部Track是否都准备好了
* @return
*/
bool
isAllTrackReady
()
const
;
protected
:
/**
* 某track已经准备好,其ready()状态返回true,
* 此时代表可以获取其例如sps pps等相关信息了
* @param track
*/
virtual
void
onTrackReady
(
const
Track
::
Ptr
&
track
)
{};
/**
* 所有Track已经准备好,
*/
virtual
void
onAllTrackReady
()
{};
/**
* 某Track输出frame,在onAllTrackReady触发后才会调用此方法
* @param frame
*/
virtual
void
onTrackFrame
(
const
Frame
::
Ptr
&
frame
)
{};
private
:
mutex
_mtx
;
map
<
int
,
Track
::
Ptr
>
_track_map
;
map
<
int
,
function
<
void
()
>
>
_trackReadyCallback
;
bool
_allTrackReady
=
false
;
};
}
//namespace mediakit
#endif //ZLMEDIAKIT_MEDIASINK_H
src/Common/MultiMediaSourceMuxer.h
查看文件 @
820da438
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
#include "RtspMuxer/RtspMediaSourceMuxer.h"
#include "RtspMuxer/RtspMediaSourceMuxer.h"
#include "RtmpMuxer/RtmpMediaSourceMuxer.h"
#include "RtmpMuxer/RtmpMediaSourceMuxer.h"
class
MultiMediaSourceMuxer
:
public
Frame
Ring
WriterInterface
{
class
MultiMediaSourceMuxer
:
public
FrameWriterInterface
{
public
:
public
:
typedef
std
::
shared_ptr
<
MultiMediaSourceMuxer
>
Ptr
;
typedef
std
::
shared_ptr
<
MultiMediaSourceMuxer
>
Ptr
;
...
...
src/Device/PlayerProxy.cpp
查看文件 @
820da438
...
@@ -59,9 +59,6 @@ static uint8_t s_mute_adts[] = {0xff, 0xf1, 0x6c, 0x40, 0x2d, 0x3f, 0xfc, 0x00,
...
@@ -59,9 +59,6 @@ static uint8_t s_mute_adts[] = {0xff, 0xf1, 0x6c, 0x40, 0x2d, 0x3f, 0xfc, 0x00,
0x5c
,
0xa7
,
0x17
,
0xcf
,
0x34
,
0x57
,
0xc9
,
0x58
,
0xc5
,
0x20
,
0x09
,
0xee
,
0xa5
,
0xf2
,
0x9c
,
0x6c
,
0x5c
,
0xa7
,
0x17
,
0xcf
,
0x34
,
0x57
,
0xc9
,
0x58
,
0xc5
,
0x20
,
0x09
,
0xee
,
0xa5
,
0xf2
,
0x9c
,
0x6c
,
0x39
,
0x1a
,
0x77
,
0x92
,
0x9b
,
0xff
,
0xc6
,
0xae
,
0xf8
,
0x36
,
0xba
,
0xa8
,
0xaa
,
0x6b
,
0x1e
,
0x8c
,
0x39
,
0x1a
,
0x77
,
0x92
,
0x9b
,
0xff
,
0xc6
,
0xae
,
0xf8
,
0x36
,
0xba
,
0xa8
,
0xaa
,
0x6b
,
0x1e
,
0x8c
,
0xc5
,
0x97
,
0x39
,
0x6a
,
0xb8
,
0xa2
,
0x55
,
0xa8
,
0xf8
};
0xc5
,
0x97
,
0x39
,
0x6a
,
0xb8
,
0xa2
,
0x55
,
0xa8
,
0xf8
};
#define MUTE_ADTS_CHN_CNT 1
#define MUTE_ADTS_SAMPLE_BIT 16
#define MUTE_ADTS_SAMPLE_RATE 8000
#define MUTE_ADTS_DATA s_mute_adts
#define MUTE_ADTS_DATA s_mute_adts
#define MUTE_ADTS_DATA_LEN sizeof(s_mute_adts)
#define MUTE_ADTS_DATA_LEN sizeof(s_mute_adts)
#define MUTE_ADTS_DATA_MS 130
#define MUTE_ADTS_DATA_MS 130
...
...
src/Player/Frame.h
查看文件 @
820da438
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
#define ZLMEDIAKIT_FRAME_H
#define ZLMEDIAKIT_FRAME_H
#include <mutex>
#include <mutex>
#include <functional>
#include "Util/RingBuffer.h"
#include "Util/RingBuffer.h"
#include "Network/Socket.h"
#include "Network/Socket.h"
...
@@ -106,12 +107,12 @@ private:
...
@@ -106,12 +107,12 @@ private:
ResourcePool
<
T
>
_pool
;
ResourcePool
<
T
>
_pool
;
};
};
class
Frame
Ring
WriterInterface
{
class
FrameWriterInterface
{
public
:
public
:
typedef
std
::
shared_ptr
<
Frame
Ring
WriterInterface
>
Ptr
;
typedef
std
::
shared_ptr
<
FrameWriterInterface
>
Ptr
;
Frame
Ring
WriterInterface
(){}
FrameWriterInterface
(){}
virtual
~
Frame
Ring
WriterInterface
(){}
virtual
~
FrameWriterInterface
(){}
/**
/**
* 写入帧数据
* 写入帧数据
* @param frame 帧
* @param frame 帧
...
@@ -119,10 +120,31 @@ public:
...
@@ -119,10 +120,31 @@ public:
virtual
void
inputFrame
(
const
Frame
::
Ptr
&
frame
)
=
0
;
virtual
void
inputFrame
(
const
Frame
::
Ptr
&
frame
)
=
0
;
};
};
class
FrameWriterInterfaceHelper
:
public
FrameWriterInterface
{
public
:
typedef
std
::
shared_ptr
<
FrameWriterInterfaceHelper
>
Ptr
;
typedef
std
::
function
<
void
(
const
Frame
::
Ptr
&
frame
)
>
onWriteFrame
;
FrameWriterInterfaceHelper
(
const
onWriteFrame
&
cb
){
_writeCallback
=
cb
;
}
virtual
~
FrameWriterInterfaceHelper
(){}
/**
* 写入帧数据
* @param frame 帧
*/
void
inputFrame
(
const
Frame
::
Ptr
&
frame
)
override
{
_writeCallback
(
frame
);
}
private
:
onWriteFrame
_writeCallback
;
};
/**
/**
* 帧环形缓存接口类
* 帧环形缓存接口类
*/
*/
class
FrameRingInterface
:
public
Frame
Ring
WriterInterface
{
class
FrameRingInterface
:
public
FrameWriterInterface
{
public
:
public
:
typedef
RingBuffer
<
Frame
::
Ptr
>
RingType
;
typedef
RingBuffer
<
Frame
::
Ptr
>
RingType
;
typedef
std
::
shared_ptr
<
FrameRingInterface
>
Ptr
;
typedef
std
::
shared_ptr
<
FrameRingInterface
>
Ptr
;
...
@@ -187,7 +209,7 @@ public:
...
@@ -187,7 +209,7 @@ public:
FrameRingInterfaceDelegate
(){}
FrameRingInterfaceDelegate
(){}
virtual
~
FrameRingInterfaceDelegate
(){}
virtual
~
FrameRingInterfaceDelegate
(){}
void
addDelegate
(
const
Frame
Ring
WriterInterface
::
Ptr
&
delegate
){
void
addDelegate
(
const
FrameWriterInterface
::
Ptr
&
delegate
){
lock_guard
<
mutex
>
lck
(
_mtx
);
lock_guard
<
mutex
>
lck
(
_mtx
);
_delegateMap
.
emplace
(
delegate
.
get
(),
delegate
);
_delegateMap
.
emplace
(
delegate
.
get
(),
delegate
);
}
}
...
@@ -210,7 +232,7 @@ public:
...
@@ -210,7 +232,7 @@ public:
}
}
private
:
private
:
mutex
_mtx
;
mutex
_mtx
;
map
<
void
*
,
Frame
Ring
WriterInterface
::
Ptr
>
_delegateMap
;
map
<
void
*
,
FrameWriterInterface
::
Ptr
>
_delegateMap
;
};
};
...
...
src/RtmpMuxer/RtmpMediaSourceMuxer.h
查看文件 @
820da438
...
@@ -52,7 +52,7 @@ public:
...
@@ -52,7 +52,7 @@ public:
return
_mediaSouce
->
getRing
()
->
readerCount
();
return
_mediaSouce
->
getRing
()
->
readerCount
();
}
}
private
:
private
:
void
on
Inited
()
override
{
void
on
AllTrackReady
()
override
{
_mediaSouce
->
onGetMetaData
(
getMetedata
());
_mediaSouce
->
onGetMetaData
(
getMetedata
());
}
}
private
:
private
:
...
...
src/RtmpMuxer/RtmpMuxer.cpp
查看文件 @
820da438
...
@@ -28,19 +28,21 @@
...
@@ -28,19 +28,21 @@
namespace
mediakit
{
namespace
mediakit
{
void
RtmpMuxer
::
addTrack
(
const
Track
::
Ptr
&
track_in
)
{
RtmpMuxer
::
RtmpMuxer
(
const
TitleMete
::
Ptr
&
title
)
{
//克隆Track,只拷贝其数据,不拷贝其数据转发关系
if
(
!
title
){
auto
track
=
track_in
->
clone
();
_metedata
=
std
::
make_shared
<
TitleMete
>
()
->
getMetedata
();
auto
codec_id
=
track
->
getCodecId
();
}
else
{
_track_map
[
codec_id
]
=
track
;
_metedata
=
title
->
getMetedata
();
}
_rtmpRing
=
std
::
make_shared
<
RtmpRingInterface
::
RingType
>
();
}
auto
lam
=
[
this
,
track
]()
{
void
RtmpMuxer
::
onTrackReady
(
const
Track
::
Ptr
&
track
)
{
//异步生成R
tmp编码器
//生成r
tmp编码器
auto
encoder
=
Factory
::
getRtmpCodecByTrack
(
track
);
auto
encoder
=
Factory
::
getRtmpCodecByTrack
(
track
);
if
(
!
encoder
)
{
if
(
!
encoder
)
{
return
;
return
;
}
}
//根据track生产metedata
//根据track生产metedata
Metedata
::
Ptr
metedate
;
Metedata
::
Ptr
metedate
;
switch
(
track
->
getTrackType
()){
switch
(
track
->
getTrackType
()){
...
@@ -64,17 +66,11 @@ void RtmpMuxer::addTrack(const Track::Ptr &track_in) {
...
@@ -64,17 +66,11 @@ void RtmpMuxer::addTrack(const Track::Ptr &track_in) {
track
->
addDelegate
(
encoder
);
track
->
addDelegate
(
encoder
);
//Rtmp编码器共用同一个环形缓存
//Rtmp编码器共用同一个环形缓存
encoder
->
setRtmpRing
(
_rtmpRing
);
encoder
->
setRtmpRing
(
_rtmpRing
);
};
if
(
track
->
ready
()){
lam
();
}
else
{
_trackReadyCallback
[
codec_id
]
=
lam
;
}
}
}
const
AMFValue
&
RtmpMuxer
::
getMetedata
()
const
{
const
AMFValue
&
RtmpMuxer
::
getMetedata
()
const
{
if
(
!
_trackReadyCallback
.
empt
y
()){
if
(
!
isAllTrackRead
y
()){
//尚未就绪
//尚未就绪
static
AMFValue
s_amf
;
static
AMFValue
s_amf
;
return
s_amf
;
return
s_amf
;
...
@@ -82,36 +78,8 @@ const AMFValue &RtmpMuxer::getMetedata() const {
...
@@ -82,36 +78,8 @@ const AMFValue &RtmpMuxer::getMetedata() const {
return
_metedata
;
return
_metedata
;
}
}
void
RtmpMuxer
::
inputFrame
(
const
Frame
::
Ptr
&
frame
)
{
auto
codec_id
=
frame
->
getCodecId
();
auto
it
=
_track_map
.
find
(
codec_id
);
if
(
it
==
_track_map
.
end
())
{
return
;
}
it
->
second
->
inputFrame
(
frame
);
if
(
!
_inited
&&
!
_trackReadyCallback
.
empty
()
&&
it
->
second
->
ready
()){
//Track由未就绪状态装换成就绪状态,我们就生成metedata以及Rtmp编码器
auto
it_callback
=
_trackReadyCallback
.
find
(
codec_id
);
if
(
it_callback
!=
_trackReadyCallback
.
end
()){
it_callback
->
second
();
_trackReadyCallback
.
erase
(
it_callback
);
}
}
if
(
!
_inited
&&
_trackReadyCallback
.
empty
()){
_inited
=
true
;
onInited
();
}
}
bool
RtmpMuxer
::
inputRtmp
(
const
RtmpPacket
::
Ptr
&
rtmp
,
bool
key_pos
)
{
_rtmpRing
->
write
(
rtmp
,
key_pos
);
return
key_pos
;
}
RtmpRingInterface
::
RingType
::
Ptr
RtmpMuxer
::
getRtmpRing
()
const
{
RtmpRingInterface
::
RingType
::
Ptr
RtmpMuxer
::
getRtmpRing
()
const
{
return
_rtmpRing
;
return
_rtmpRing
;
}
}
}
}
/* namespace mediakit */
\ No newline at end of file
\ No newline at end of file
src/RtmpMuxer/RtmpMuxer.h
查看文件 @
820da438
...
@@ -29,65 +29,41 @@
...
@@ -29,65 +29,41 @@
#include "RtmpMetedata.h"
#include "RtmpMetedata.h"
#include "Player/Frame.h"
#include "Player/Frame.h"
#include "Common/MediaSink.h"
namespace
mediakit
{
namespace
mediakit
{
class
RtmpMuxer
:
public
FrameRingWriterInterface
{
class
RtmpMuxer
:
public
MediaSink
{
public
:
public
:
typedef
std
::
shared_ptr
<
RtmpMuxer
>
Ptr
;
typedef
std
::
shared_ptr
<
RtmpMuxer
>
Ptr
;
/**
/**
* 构造函数
* 构造函数
*/
*/
RtmpMuxer
(
const
TitleMete
::
Ptr
&
title
=
nullptr
)
:
_metedata
(
AMF_OBJECT
){
RtmpMuxer
(
const
TitleMete
::
Ptr
&
title
);
if
(
!
title
){
_metedata
=
std
::
make_shared
<
TitleMete
>
()
->
getMetedata
();
}
else
{
_metedata
=
title
->
getMetedata
();
}
_rtmpRing
=
std
::
make_shared
<
RtmpRingInterface
::
RingType
>
();
}
virtual
~
RtmpMuxer
(){}
virtual
~
RtmpMuxer
(){}
/**
/**
* 添加音视频媒体
* @param track 媒体描述
*/
void
addTrack
(
const
Track
::
Ptr
&
track
)
;
/**
* 获取完整的SDP字符串
* 获取完整的SDP字符串
* @return SDP字符串
* @return SDP字符串
*/
*/
const
AMFValue
&
getMetedata
()
const
;
const
AMFValue
&
getMetedata
()
const
;
/**
/**
* 写入帧数据然后打包rtmp
* @param frame 帧数据
*/
void
inputFrame
(
const
Frame
::
Ptr
&
frame
)
override
;
/**
* 也可以在外部打包好rtmp然后再写入
* @param rtmp rtmp包
* @param key_pos 是否为关键帧
*/
bool
inputRtmp
(
const
RtmpPacket
::
Ptr
&
rtmp
,
bool
key_pos
=
true
);
/**
* 获取rtmp环形缓存
* 获取rtmp环形缓存
* @return
* @return
*/
*/
RtmpRingInterface
::
RingType
::
Ptr
getRtmpRing
()
const
;
RtmpRingInterface
::
RingType
::
Ptr
getRtmpRing
()
const
;
protected
:
protected
:
virtual
void
onInited
(){};
/**
* 某track已经准备好,其ready()状态返回true,
* 此时代表可以获取其例如sps pps等相关信息了
* @param track
*/
void
onTrackReady
(
const
Track
::
Ptr
&
track
)
override
;
private
:
private
:
map
<
int
,
Track
::
Ptr
>
_track_map
;
map
<
int
,
function
<
void
()
>
>
_trackReadyCallback
;
RtmpRingInterface
::
RingType
::
Ptr
_rtmpRing
;
RtmpRingInterface
::
RingType
::
Ptr
_rtmpRing
;
AMFValue
_metedata
;
AMFValue
_metedata
;
bool
_inited
=
false
;
};
};
...
...
src/RtspMuxer/RtspMediaSourceMuxer.h
查看文件 @
820da438
...
@@ -55,7 +55,7 @@ public:
...
@@ -55,7 +55,7 @@ public:
_mediaSouce
->
setTimeStamp
(
stamp
);
_mediaSouce
->
setTimeStamp
(
stamp
);
}
}
private
:
private
:
void
on
Inited
()
override
{
void
on
AllTrackReady
()
override
{
_mediaSouce
->
onGetSDP
(
getSdp
());
_mediaSouce
->
onGetSDP
(
getSdp
());
}
}
private
:
private
:
...
...
src/RtspMuxer/RtspMuxer.cpp
查看文件 @
820da438
...
@@ -29,24 +29,25 @@
...
@@ -29,24 +29,25 @@
namespace
mediakit
{
namespace
mediakit
{
void
RtspMuxer
::
addTrack
(
const
Track
::
Ptr
&
track_in
,
uint32_t
ssrc
,
int
mtu
)
{
RtspMuxer
::
RtspMuxer
(
const
TitleSdp
::
Ptr
&
title
){
//克隆Track,只拷贝其数据,不拷贝其数据转发关系
if
(
!
title
){
auto
track
=
track_in
->
clone
();
_sdp
=
std
::
make_shared
<
TitleSdp
>
()
->
getSdp
();
auto
codec_id
=
track
->
getCodecId
();
}
else
{
_track_map
[
codec_id
]
=
track
;
_sdp
=
title
->
getSdp
();
if
(
mtu
==
0
){
mtu
=
(
track
->
getTrackType
()
==
TrackVideo
?
1400
:
600
);
}
}
auto
lam
=
[
this
,
ssrc
,
mtu
,
track
](){
_rtpRing
=
std
::
make_shared
<
RtpRingInterface
::
RingType
>
();
//异步生成rtp编码器
}
void
RtspMuxer
::
onTrackReady
(
const
Track
::
Ptr
&
track
)
{
//根据track生产sdp
//根据track生产sdp
Sdp
::
Ptr
sdp
=
Factory
::
getSdpByTrack
(
track
);
Sdp
::
Ptr
sdp
=
Factory
::
getSdpByTrack
(
track
);
if
(
!
sdp
)
{
if
(
!
sdp
)
{
return
;
return
;
}
}
uint32_t
ssrc
=
((
uint64_t
)
sdp
.
get
())
&
0xFFFFFFFF
;
// 根据sdp生成rtp编码器
auto
mtu
=
(
track
->
getTrackType
()
==
TrackVideo
?
1400
:
600
);
auto
encoder
=
sdp
->
createRtpEncoder
(
ssrc
?
ssrc
:
((
uint64_t
)
sdp
.
get
())
&
0xFFFFFFFF
,
mtu
);
// 根据sdp生成rtp编码器ssrc
auto
encoder
=
sdp
->
createRtpEncoder
(
ssrc
,
mtu
);
if
(
!
encoder
)
{
if
(
!
encoder
)
{
return
;
return
;
}
}
...
@@ -56,52 +57,19 @@ void RtspMuxer::addTrack(const Track::Ptr &track_in, uint32_t ssrc, int mtu) {
...
@@ -56,52 +57,19 @@ void RtspMuxer::addTrack(const Track::Ptr &track_in, uint32_t ssrc, int mtu) {
track
->
addDelegate
(
encoder
);
track
->
addDelegate
(
encoder
);
//rtp编码器共用同一个环形缓存
//rtp编码器共用同一个环形缓存
encoder
->
setRtpRing
(
_rtpRing
);
encoder
->
setRtpRing
(
_rtpRing
);
};
if
(
track
->
ready
()){
lam
();
}
else
{
_trackReadyCallback
[
codec_id
]
=
lam
;
}
}
}
string
RtspMuxer
::
getSdp
()
{
string
RtspMuxer
::
getSdp
()
{
if
(
!
_trackReadyCallback
.
empt
y
()){
if
(
!
isAllTrackRead
y
()){
//尚未就绪
//尚未就绪
return
""
;
return
""
;
}
}
return
_sdp
;
return
_sdp
;
}
}
void
RtspMuxer
::
inputFrame
(
const
Frame
::
Ptr
&
frame
)
{
auto
codec_id
=
frame
->
getCodecId
();
auto
it
=
_track_map
.
find
(
codec_id
);
if
(
it
==
_track_map
.
end
())
{
return
;
}
it
->
second
->
inputFrame
(
frame
);
if
(
!
_inited
&&
!
_trackReadyCallback
.
empty
()
&&
it
->
second
->
ready
()){
//Track由未就绪状态装换成就绪状态,我们就生成sdp以及rtp编码器
auto
it_callback
=
_trackReadyCallback
.
find
(
codec_id
);
if
(
it_callback
!=
_trackReadyCallback
.
end
()){
it_callback
->
second
();
_trackReadyCallback
.
erase
(
it_callback
);
}
}
if
(
!
_inited
&&
_trackReadyCallback
.
empty
()){
_inited
=
true
;
onInited
();
}
}
bool
RtspMuxer
::
inputRtp
(
const
RtpPacket
::
Ptr
&
rtp
,
bool
key_pos
)
{
_rtpRing
->
write
(
rtp
,
key_pos
);
return
key_pos
;
}
RtpRingInterface
::
RingType
::
Ptr
RtspMuxer
::
getRtpRing
()
const
{
RtpRingInterface
::
RingType
::
Ptr
RtspMuxer
::
getRtpRing
()
const
{
return
_rtpRing
;
return
_rtpRing
;
}
}
}
/* namespace mediakit */
}
/* namespace mediakit */
\ No newline at end of file
src/RtspMuxer/RtspMuxer.h
查看文件 @
820da438
...
@@ -29,35 +29,22 @@
...
@@ -29,35 +29,22 @@
#include "RtspSdp.h"
#include "RtspSdp.h"
#include "Player/Frame.h"
#include "Player/Frame.h"
#include "Common/MediaSink.h"
namespace
mediakit
{
namespace
mediakit
{
/**
/**
* rtsp生成器
* rtsp生成器
*/
*/
class
RtspMuxer
:
public
FrameRingWriterInterface
{
class
RtspMuxer
:
public
MediaSink
{
public
:
public
:
typedef
std
::
shared_ptr
<
RtspMuxer
>
Ptr
;
typedef
std
::
shared_ptr
<
RtspMuxer
>
Ptr
;
/**
/**
* 构造函数
* 构造函数
*/
*/
RtspMuxer
(
const
TitleSdp
::
Ptr
&
title
=
nullptr
){
RtspMuxer
(
const
TitleSdp
::
Ptr
&
title
=
nullptr
);
if
(
!
title
){
_sdp
=
std
::
make_shared
<
TitleSdp
>
()
->
getSdp
();
}
else
{
_sdp
=
title
->
getSdp
();
}
_rtpRing
=
std
::
make_shared
<
RtpRingInterface
::
RingType
>
();
}
virtual
~
RtspMuxer
(){}
/**
virtual
~
RtspMuxer
(){}
* 添加音视频媒体
* @param track 媒体描述
* @param ssrc 媒体rtp ssrc
* @param mtu 媒体rtp mtu
*/
void
addTrack
(
const
Track
::
Ptr
&
track
,
uint32_t
ssrc
=
0
,
int
mtu
=
0
)
;
/**
/**
* 获取完整的SDP字符串
* 获取完整的SDP字符串
...
@@ -66,32 +53,20 @@ public:
...
@@ -66,32 +53,20 @@ public:
string
getSdp
()
;
string
getSdp
()
;
/**
/**
* 写入帧数据然后打包rtp
* @param frame 帧数据
*/
void
inputFrame
(
const
Frame
::
Ptr
&
frame
)
override
;
/**
* 也可以在外部打包好rtp然后再写入
* @param rtp rtp包
* @param key_pos 是否为关键帧的第一个rtp包
*/
bool
inputRtp
(
const
RtpPacket
::
Ptr
&
rtp
,
bool
key_pos
=
true
);
/**
* 获取rtp环形缓存
* 获取rtp环形缓存
* @return
* @return
*/
*/
RtpRingInterface
::
RingType
::
Ptr
getRtpRing
()
const
;
RtpRingInterface
::
RingType
::
Ptr
getRtpRing
()
const
;
protected
:
protected
:
virtual
void
onInited
(){};
/**
* 某track已经准备好,其ready()状态返回true,
* 此时代表可以获取其例如sps pps等相关信息了
* @param track
*/
void
onTrackReady
(
const
Track
::
Ptr
&
track
)
override
;
private
:
private
:
map
<
int
,
Track
::
Ptr
>
_track_map
;
map
<
int
,
function
<
void
()
>
>
_trackReadyCallback
;
RtpRingInterface
::
RingType
::
Ptr
_rtpRing
;
RtpRingInterface
::
RingType
::
Ptr
_rtpRing
;
string
_sdp
;
string
_sdp
;
bool
_inited
=
false
;
};
};
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论