Commit a0001bf2 by xiongziliang

优化日志友好度

parent 86b053db
...@@ -181,6 +181,25 @@ void RtpProcess::onRtpDecode(const void *packet, int bytes, uint32_t, int flags) ...@@ -181,6 +181,25 @@ void RtpProcess::onRtpDecode(const void *packet, int bytes, uint32_t, int flags)
} }
} }
#define SWITCH_CASE(codec_id) case codec_id : return #codec_id
static const char *getCodecName(int codec_id) {
switch (codec_id) {
SWITCH_CASE(STREAM_VIDEO_MPEG4);
SWITCH_CASE(STREAM_VIDEO_H264);
SWITCH_CASE(STREAM_VIDEO_H265);
SWITCH_CASE(STREAM_VIDEO_SVAC);
SWITCH_CASE(STREAM_AUDIO_MP3);
SWITCH_CASE(STREAM_AUDIO_AAC);
SWITCH_CASE(STREAM_AUDIO_G711);
SWITCH_CASE(STREAM_AUDIO_G722);
SWITCH_CASE(STREAM_AUDIO_G723);
SWITCH_CASE(STREAM_AUDIO_G729);
SWITCH_CASE(STREAM_AUDIO_SVAC);
default:
return "unknown codec";
}
}
void RtpProcess::onPSDecode(int stream, void RtpProcess::onPSDecode(int stream,
int codecid, int codecid,
int flags, int flags,
...@@ -204,7 +223,7 @@ void RtpProcess::onPSDecode(int stream, ...@@ -204,7 +223,7 @@ void RtpProcess::onPSDecode(int stream,
} }
if (codecid != _codecid_video) { if (codecid != _codecid_video) {
WarnL << "video track change to H264 from codecid:" << _codecid_video; WarnL << "video track change to H264 from codecid:" << getCodecName(_codecid_video);
return; return;
} }
...@@ -227,7 +246,7 @@ void RtpProcess::onPSDecode(int stream, ...@@ -227,7 +246,7 @@ void RtpProcess::onPSDecode(int stream,
_muxer->addTrack(track); _muxer->addTrack(track);
} }
if (codecid != _codecid_video) { if (codecid != _codecid_video) {
WarnL << "video track change to H265 from codecid:" << _codecid_video; WarnL << "video track change to H265 from codecid:" << getCodecName(_codecid_video);
return; return;
} }
if(_save_file_video){ if(_save_file_video){
...@@ -250,14 +269,16 @@ void RtpProcess::onPSDecode(int stream, ...@@ -250,14 +269,16 @@ void RtpProcess::onPSDecode(int stream,
} }
if (codecid != _codecid_audio) { if (codecid != _codecid_audio) {
WarnL << "audio track change to AAC from codecid:" << _codecid_audio; WarnL << "audio track change to AAC from codecid:" << getCodecName(_codecid_audio);
return; return;
} }
_muxer->inputFrame(std::make_shared<AACFrameNoCacheAble>((char *) data, bytes, dts, 7)); _muxer->inputFrame(std::make_shared<AACFrameNoCacheAble>((char *) data, bytes, dts, 7));
break; break;
} }
default: default:
WarnL << "unsupported codec type:" << codecid; if(codecid != 0){
WarnL << "unsupported codec type:" << getCodecName(codecid);
}
return; return;
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论