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
e85a8f27
Commit
e85a8f27
authored
Apr 24, 2020
by
xiongziliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RTMP协议限制G711规格、日志打印codec相关信息
parent
46740b7c
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
51 行增加
和
2 行删除
+51
-2
src/Common/MediaSource.cpp
+29
-2
src/Rtmp/RtmpMuxer.cpp
+22
-0
没有找到文件。
src/Common/MediaSource.cpp
查看文件 @
e85a8f27
...
...
@@ -293,7 +293,34 @@ void MediaSource::regist() {
lock_guard
<
recursive_mutex
>
lock
(
g_mtxMediaSrc
);
g_mapMediaSrc
[
_strSchema
][
_strVhost
][
_strApp
][
_strId
]
=
shared_from_this
();
}
InfoL
<<
_strSchema
<<
" "
<<
_strVhost
<<
" "
<<
_strApp
<<
" "
<<
_strId
;
_StrPrinter
codec_info
;
auto
tracks
=
getTracks
(
true
);
for
(
auto
&
track
:
tracks
)
{
auto
codec_type
=
track
->
getTrackType
();
codec_info
<<
track
->
getCodecName
();
switch
(
codec_type
)
{
case
TrackAudio
:
{
auto
audio_track
=
dynamic_pointer_cast
<
AudioTrack
>
(
track
);
codec_info
<<
"["
<<
audio_track
->
getAudioSampleRate
()
<<
"/"
<<
audio_track
->
getAudioChannel
()
<<
"/"
<<
audio_track
->
getAudioSampleBit
()
<<
"] "
;
break
;
}
case
TrackVideo
:
{
auto
video_track
=
dynamic_pointer_cast
<
VideoTrack
>
(
track
);
codec_info
<<
"["
<<
video_track
->
getVideoWidth
()
<<
"/"
<<
video_track
->
getVideoHeight
()
<<
"/"
<<
(
int
)
video_track
->
getVideoFps
()
<<
"] "
;
break
;
}
default
:
break
;
}
}
InfoL
<<
_strSchema
<<
" "
<<
_strVhost
<<
" "
<<
_strApp
<<
" "
<<
_strId
<<
" "
<<
codec_info
;
NoticeCenter
::
Instance
().
emitEvent
(
Broadcast
::
kBroadcastMediaChanged
,
true
,
*
this
);
}
...
...
@@ -319,7 +346,7 @@ bool MediaSource::unregist() {
}
if
(
ret
){
InfoL
<<
""
<<
_strSchema
<<
" "
<<
_strVhost
<<
" "
<<
_strApp
<<
" "
<<
_strId
;
InfoL
<<
_strSchema
<<
" "
<<
_strVhost
<<
" "
<<
_strApp
<<
" "
<<
_strId
;
NoticeCenter
::
Instance
().
emitEvent
(
Broadcast
::
kBroadcastMediaChanged
,
false
,
*
this
);
}
return
ret
;
...
...
src/Rtmp/RtmpMuxer.cpp
查看文件 @
e85a8f27
...
...
@@ -39,6 +39,28 @@ void RtmpMuxer::addTrack(const Track::Ptr &track) {
}
switch
(
track
->
getCodecId
()){
case
CodecG711A
:
case
CodecG711U
:{
auto
audio_track
=
dynamic_pointer_cast
<
AudioTrack
>
(
track
);
if
(
!
audio_track
){
return
;
}
if
(
audio_track
->
getAudioSampleRate
()
!=
8000
||
audio_track
->
getAudioChannel
()
!=
1
||
audio_track
->
getAudioSampleBit
()
!=
16
)
{
WarnL
<<
"RTMP只支持8000/1/16规格的G711,目前规格是:"
<<
audio_track
->
getAudioSampleRate
()
<<
"/"
<<
audio_track
->
getAudioChannel
()
<<
"/"
<<
audio_track
->
getAudioSampleBit
()
<<
",该音频已被忽略"
;
return
;
}
break
;
}
default
:
break
;
}
auto
&
encoder
=
_encoder
[
track
->
getTrackType
()];
//生成rtmp编码器,克隆该Track,防止循环引用
encoder
=
Factory
::
getRtmpCodecByTrack
(
track
->
clone
());
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论