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
3c1e0531
Commit
3c1e0531
authored
May 21, 2020
by
xiongziliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复循环引用的问题
parent
5cc4258b
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
8 行增加
和
8 行删除
+8
-8
src/Http/HlsPlayer.cpp
+1
-1
src/Rtp/Decoder.cpp
+2
-2
src/Rtp/Decoder.h
+3
-3
src/Rtp/RtpProcess.cpp
+2
-2
没有找到文件。
src/Http/HlsPlayer.cpp
查看文件 @
3c1e0531
...
...
@@ -241,7 +241,7 @@ void HlsPlayerImp::onPacket(const char *data,uint64_t len) {
}
if
(
!
_decoder
)
{
_decoder
=
DecoderImp
::
createDecoder
(
DecoderImp
::
decoder_ts
,
dynamic_pointer_cast
<
HlsPlayerImp
>
(
shared_from_this
())
);
_decoder
=
DecoderImp
::
createDecoder
(
DecoderImp
::
decoder_ts
,
this
);
}
if
(
_decoder
)
{
...
...
src/Rtp/Decoder.cpp
查看文件 @
3c1e0531
...
...
@@ -42,7 +42,7 @@ static Decoder::Ptr createDecoder_l(DecoderImp::Type type) {
/////////////////////////////////////////////////////////////
DecoderImp
::
Ptr
DecoderImp
::
createDecoder
(
Type
type
,
const
MediaSinkInterface
::
Ptr
&
sink
){
DecoderImp
::
Ptr
DecoderImp
::
createDecoder
(
Type
type
,
MediaSinkInterface
*
sink
){
auto
decoder
=
createDecoder_l
(
type
);
if
(
!
decoder
){
return
nullptr
;
...
...
@@ -54,7 +54,7 @@ int DecoderImp::input(const uint8_t *data, int bytes){
return
_decoder
->
input
(
data
,
bytes
);
}
DecoderImp
::
DecoderImp
(
const
Decoder
::
Ptr
&
decoder
,
const
MediaSinkInterface
::
Ptr
&
sink
){
DecoderImp
::
DecoderImp
(
const
Decoder
::
Ptr
&
decoder
,
MediaSinkInterface
*
sink
){
_decoder
=
decoder
;
_sink
=
sink
;
_decoder
->
setOnDecode
([
this
](
int
stream
,
int
codecid
,
int
flags
,
int64_t
pts
,
int64_t
dts
,
const
void
*
data
,
int
bytes
){
...
...
src/Rtp/Decoder.h
查看文件 @
3c1e0531
...
...
@@ -53,7 +53,7 @@ public:
typedef
std
::
shared_ptr
<
DecoderImp
>
Ptr
;
~
DecoderImp
()
=
default
;
static
Ptr
createDecoder
(
Type
type
,
const
MediaSinkInterface
::
Ptr
&
sink
);
static
Ptr
createDecoder
(
Type
type
,
MediaSinkInterface
*
sink
);
int
input
(
const
uint8_t
*
data
,
int
bytes
);
protected
:
...
...
@@ -61,12 +61,12 @@ protected:
void
onFrame
(
const
Frame
::
Ptr
&
frame
);
private
:
DecoderImp
(
const
Decoder
::
Ptr
&
decoder
,
const
MediaSinkInterface
::
Ptr
&
sink
);
DecoderImp
(
const
Decoder
::
Ptr
&
decoder
,
MediaSinkInterface
*
sink
);
void
onDecode
(
int
stream
,
int
codecid
,
int
flags
,
int64_t
pts
,
int64_t
dts
,
const
void
*
data
,
int
bytes
);
private
:
Decoder
::
Ptr
_decoder
;
MediaSinkInterface
::
Ptr
_sink
;
MediaSinkInterface
*
_sink
;
FrameMerger
_merger
;
int
_codecid_video
=
0
;
int
_codecid_audio
=
0
;
...
...
src/Rtp/RtpProcess.cpp
查看文件 @
3c1e0531
...
...
@@ -152,11 +152,11 @@ void RtpProcess::onRtpDecode(const uint8_t *packet, int bytes, uint32_t timestam
if
(
checkTS
(
packet
,
bytes
))
{
//猜测是ts负载
InfoP
(
this
)
<<
"judged to be TS"
;
_decoder
=
DecoderImp
::
createDecoder
(
DecoderImp
::
decoder_ts
,
shared_from_this
()
);
_decoder
=
DecoderImp
::
createDecoder
(
DecoderImp
::
decoder_ts
,
this
);
}
else
{
//猜测是ps负载
InfoP
(
this
)
<<
"judged to be PS"
;
_decoder
=
DecoderImp
::
createDecoder
(
DecoderImp
::
decoder_ps
,
shared_from_this
()
);
_decoder
=
DecoderImp
::
createDecoder
(
DecoderImp
::
decoder_ps
,
this
);
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论