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
2c413e07
Commit
2c413e07
authored
6 years ago
by
xiongziliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复循环池导致的bug
parent
9f16cc12
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
8 行增加
和
0 行删除
+8
-0
src/RtmpCodec/AACRtmpCodec.cpp
+4
-0
src/RtmpCodec/H264RtmpCodec.cpp
+4
-0
没有找到文件。
src/RtmpCodec/AACRtmpCodec.cpp
查看文件 @
2c413e07
...
@@ -64,6 +64,8 @@ void AACRtmpEncoder::inputFrame(const Frame::Ptr &frame) {
...
@@ -64,6 +64,8 @@ void AACRtmpEncoder::inputFrame(const Frame::Ptr &frame) {
if
(
!
_aac_cfg
.
empty
()){
if
(
!
_aac_cfg
.
empty
()){
RtmpPacket
::
Ptr
rtmpPkt
=
ResourcePoolHelper
<
RtmpPacket
>::
obtainObj
();
RtmpPacket
::
Ptr
rtmpPkt
=
ResourcePoolHelper
<
RtmpPacket
>::
obtainObj
();
rtmpPkt
->
strBuf
.
clear
();
//////////header
//////////header
uint8_t
is_config
=
false
;
uint8_t
is_config
=
false
;
rtmpPkt
->
strBuf
.
push_back
(
_ui8AudioFlags
);
rtmpPkt
->
strBuf
.
push_back
(
_ui8AudioFlags
);
...
@@ -110,6 +112,8 @@ void AACRtmpEncoder::makeAudioConfigPkt() {
...
@@ -110,6 +112,8 @@ void AACRtmpEncoder::makeAudioConfigPkt() {
_ui8AudioFlags
=
(
flvAudioType
<<
4
)
|
(
flvSampleRate
<<
2
)
|
(
flvSampleBit
<<
1
)
|
flvStereoOrMono
;
_ui8AudioFlags
=
(
flvAudioType
<<
4
)
|
(
flvSampleRate
<<
2
)
|
(
flvSampleBit
<<
1
)
|
flvStereoOrMono
;
RtmpPacket
::
Ptr
rtmpPkt
=
ResourcePoolHelper
<
RtmpPacket
>::
obtainObj
();
RtmpPacket
::
Ptr
rtmpPkt
=
ResourcePoolHelper
<
RtmpPacket
>::
obtainObj
();
rtmpPkt
->
strBuf
.
clear
();
//////////header
//////////header
uint8_t
is_config
=
true
;
uint8_t
is_config
=
true
;
rtmpPkt
->
strBuf
.
push_back
(
_ui8AudioFlags
);
rtmpPkt
->
strBuf
.
push_back
(
_ui8AudioFlags
);
...
...
This diff is collapsed.
Click to expand it.
src/RtmpCodec/H264RtmpCodec.cpp
查看文件 @
2c413e07
...
@@ -123,6 +123,8 @@ void H264RtmpEncoder::inputFrame(const Frame::Ptr &frame) {
...
@@ -123,6 +123,8 @@ void H264RtmpEncoder::inputFrame(const Frame::Ptr &frame) {
flags
|=
((
keyFrame
?
FLV_KEY_FRAME
:
FLV_INTER_FRAME
)
<<
4
);
flags
|=
((
keyFrame
?
FLV_KEY_FRAME
:
FLV_INTER_FRAME
)
<<
4
);
RtmpPacket
::
Ptr
rtmpPkt
=
ResourcePoolHelper
<
RtmpPacket
>::
obtainObj
();
RtmpPacket
::
Ptr
rtmpPkt
=
ResourcePoolHelper
<
RtmpPacket
>::
obtainObj
();
rtmpPkt
->
strBuf
.
clear
();
rtmpPkt
->
strBuf
.
push_back
(
flags
);
rtmpPkt
->
strBuf
.
push_back
(
flags
);
rtmpPkt
->
strBuf
.
push_back
(
!
is_config
);
rtmpPkt
->
strBuf
.
push_back
(
!
is_config
);
rtmpPkt
->
strBuf
.
append
(
"\x0\x0\x0"
,
3
);
rtmpPkt
->
strBuf
.
append
(
"\x0\x0\x0"
,
3
);
...
@@ -151,6 +153,8 @@ void H264RtmpEncoder::makeVideoConfigPkt() {
...
@@ -151,6 +153,8 @@ void H264RtmpEncoder::makeVideoConfigPkt() {
bool
is_config
=
true
;
bool
is_config
=
true
;
RtmpPacket
::
Ptr
rtmpPkt
=
ResourcePoolHelper
<
RtmpPacket
>::
obtainObj
();
RtmpPacket
::
Ptr
rtmpPkt
=
ResourcePoolHelper
<
RtmpPacket
>::
obtainObj
();
rtmpPkt
->
strBuf
.
clear
();
//////////header
//////////header
rtmpPkt
->
strBuf
.
push_back
(
flags
);
rtmpPkt
->
strBuf
.
push_back
(
flags
);
rtmpPkt
->
strBuf
.
push_back
(
!
is_config
);
rtmpPkt
->
strBuf
.
push_back
(
!
is_config
);
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论