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
e38f2253
Commit
e38f2253
authored
Nov 10, 2021
by
ziyue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Demuxer: 解复用减少一次MediaSink的数据过滤
parent
2a8a6cac
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
90 行增加
和
24 行删除
+90
-24
src/Player/PlayerBase.cpp
+81
-9
src/Player/PlayerBase.h
+7
-13
src/Rtmp/RtmpPlayerImp.h
+1
-1
src/Rtsp/RtspPlayerImp.h
+1
-1
没有找到文件。
src/Player/PlayerBase.cpp
查看文件 @
e38f2253
...
...
@@ -62,9 +62,32 @@ PlayerBase::PlayerBase() {
this
->
mINI
::
operator
[](
kBeatIntervalMS
)
=
5000
;
}
///////////////////////////Demuxer//////////////////////////////
bool
Demuxer
::
addTrack
(
const
Track
::
Ptr
&
track
)
{
///////////////////////////DemuxerSink//////////////////////////////
class
DemuxerSink
:
public
MediaSink
{
public
:
DemuxerSink
()
=
default
;
~
DemuxerSink
()
override
=
default
;
/**
* 设置track监听器
*/
void
setTrackListener
(
TrackListener
*
listener
);
vector
<
Track
::
Ptr
>
getTracks
(
bool
ready
=
true
)
const
override
;
protected
:
bool
addTrack
(
const
Track
::
Ptr
&
track
)
override
;
void
resetTracks
()
override
;
bool
onTrackReady
(
const
Track
::
Ptr
&
track
)
override
;
void
onAllTrackReady
()
override
;
bool
onTrackFrame
(
const
Frame
::
Ptr
&
frame
)
override
;
private
:
Track
::
Ptr
_tracks
[
TrackMax
];
TrackListener
*
_listener
=
nullptr
;
};
bool
DemuxerSink
::
addTrack
(
const
Track
::
Ptr
&
track
)
{
auto
ret
=
MediaSink
::
addTrack
(
track
);
if
(
ret
)
{
track
->
addDelegate
(
std
::
make_shared
<
FrameWriterInterfaceHelper
>
([
this
](
const
Frame
::
Ptr
&
frame
)
{
...
...
@@ -74,16 +97,16 @@ bool Demuxer::addTrack(const Track::Ptr &track) {
return
ret
;
}
void
Demuxer
::
setTrackListener
(
TrackListener
*
listener
)
{
void
Demuxer
Sink
::
setTrackListener
(
TrackListener
*
listener
)
{
_listener
=
listener
;
}
bool
Demuxer
::
onTrackReady
(
const
Track
::
Ptr
&
track
)
{
bool
Demuxer
Sink
::
onTrackReady
(
const
Track
::
Ptr
&
track
)
{
_tracks
[
track
->
getTrackType
()]
=
track
->
clone
();
return
true
;
}
void
Demuxer
::
onAllTrackReady
()
{
void
Demuxer
Sink
::
onAllTrackReady
()
{
if
(
!
_listener
)
{
return
;
}
...
...
@@ -95,11 +118,11 @@ void Demuxer::onAllTrackReady() {
_listener
->
addTrackCompleted
();
}
bool
Demuxer
::
onTrackFrame
(
const
Frame
::
Ptr
&
frame
)
{
bool
Demuxer
Sink
::
onTrackFrame
(
const
Frame
::
Ptr
&
frame
)
{
return
_tracks
[
frame
->
getTrackType
()]
->
inputFrame
(
frame
);
}
void
Demuxer
::
resetTracks
()
{
void
Demuxer
Sink
::
resetTracks
()
{
MediaSink
::
resetTracks
();
for
(
auto
&
track
:
_tracks
)
{
track
=
nullptr
;
...
...
@@ -109,7 +132,7 @@ void Demuxer::resetTracks() {
}
}
vector
<
Track
::
Ptr
>
Demuxer
::
getTracks
(
bool
ready
)
const
{
vector
<
Track
::
Ptr
>
Demuxer
Sink
::
getTracks
(
bool
ready
)
const
{
vector
<
Track
::
Ptr
>
ret
;
for
(
auto
&
track
:
_tracks
)
{
if
(
!
track
||
(
ready
&&
!
track
->
ready
()))
{
...
...
@@ -120,4 +143,53 @@ vector<Track::Ptr> Demuxer::getTracks(bool ready) const {
return
ret
;
}
///////////////////////////Demuxer//////////////////////////////
void
Demuxer
::
setTrackListener
(
TrackListener
*
listener
,
bool
wait_track_ready
)
{
if
(
wait_track_ready
)
{
auto
sink
=
std
::
make_shared
<
DemuxerSink
>
();
sink
->
setTrackListener
(
listener
);
_sink
=
std
::
move
(
sink
);
}
_listener
=
listener
;
}
bool
Demuxer
::
addTrack
(
const
Track
::
Ptr
&
track
)
{
if
(
!
_sink
)
{
_origin_track
.
emplace_back
(
track
);
}
return
_sink
?
_sink
->
addTrack
(
track
)
:
(
_listener
?
_listener
->
addTrack
(
track
)
:
false
);
}
void
Demuxer
::
addTrackCompleted
()
{
if
(
_sink
)
{
_sink
->
addTrackCompleted
();
}
else
if
(
_listener
)
{
_listener
->
addTrackCompleted
();
}
}
void
Demuxer
::
resetTracks
()
{
if
(
_sink
)
{
_sink
->
resetTracks
();
}
else
if
(
_listener
)
{
_listener
->
resetTracks
();
}
}
vector
<
Track
::
Ptr
>
Demuxer
::
getTracks
(
bool
ready
)
const
{
if
(
_sink
)
{
return
_sink
->
getTracks
(
ready
);
}
vector
<
Track
::
Ptr
>
ret
;
for
(
auto
&
track
:
_origin_track
)
{
if
(
ready
&&
!
track
->
ready
())
{
continue
;
}
ret
.
emplace_back
(
track
);
}
return
ret
;
}
}
/* namespace mediakit */
src/Player/PlayerBase.h
查看文件 @
e38f2253
...
...
@@ -238,27 +238,21 @@ protected:
std
::
shared_ptr
<
Delegate
>
_delegate
;
};
class
Demuxer
:
protected
MediaSink
{
class
Demuxer
:
protected
TrackListener
,
public
TrackSource
{
public
:
Demuxer
()
=
default
;
~
Demuxer
()
override
=
default
;
/**
* 设置track监听器
*/
void
setTrackListener
(
TrackListener
*
listener
);
vector
<
Track
::
Ptr
>
getTracks
(
bool
ready
=
true
)
const
override
;
protected
:
bool
addTrack
(
const
Track
::
Ptr
&
track
)
override
;
void
setTrackListener
(
TrackListener
*
listener
,
bool
wait_track_ready
=
false
);
bool
addTrack
(
const
Track
::
Ptr
&
track
)
override
;
void
addTrackCompleted
()
override
;
void
resetTracks
()
override
;
bool
onTrackReady
(
const
Track
::
Ptr
&
track
)
override
;
void
onAllTrackReady
()
override
;
bool
onTrackFrame
(
const
Frame
::
Ptr
&
frame
)
override
;
vector
<
Track
::
Ptr
>
getTracks
(
bool
trackReady
=
true
)
const
override
;
private
:
Track
::
Ptr
_tracks
[
TrackMax
]
;
MediaSink
::
Ptr
_sink
;
TrackListener
*
_listener
=
nullptr
;
vector
<
Track
::
Ptr
>
_origin_track
;
};
}
/* namespace mediakit */
...
...
src/Rtmp/RtmpPlayerImp.h
查看文件 @
e38f2253
...
...
@@ -98,7 +98,7 @@ private:
_rtmp_src
->
setMetaData
(
val
);
}
_demuxer
=
std
::
make_shared
<
RtmpDemuxer
>
();
_demuxer
->
setTrackListener
(
this
);
_demuxer
->
setTrackListener
(
this
,
true
);
_demuxer
->
loadMetaData
(
val
);
}
...
...
src/Rtsp/RtspPlayerImp.h
查看文件 @
e38f2253
...
...
@@ -76,7 +76,7 @@ private:
_rtsp_media_src
->
setSdp
(
sdp
);
}
_demuxer
=
std
::
make_shared
<
RtspDemuxer
>
();
_demuxer
->
setTrackListener
(
this
);
_demuxer
->
setTrackListener
(
this
,
true
);
_demuxer
->
loadSdp
(
sdp
);
return
true
;
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论