From 6a9bc8aca5e54e486c6ee2ad7b9c35c70c317b88 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Mon, 9 Apr 2018 11:33:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZLToolKit | 2 +- c_wrapper/src/player.cpp | 2 +- src/MediaFile/MediaReader.cpp | 4 ++-- src/Player/Player.cpp | 2 +- tests/test_benchmark.cpp | 2 +- tests/test_httpApi.cpp | 2 +- tests/test_player.cpp | 2 +- tests/test_server.cpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ZLToolKit b/ZLToolKit index efa7c8ee..b9c850fe 160000 --- a/ZLToolKit +++ b/ZLToolKit @@ -1 +1 @@ -Subproject commit efa7c8ee4f1cc61cac11d32832a09d900008f44b +Subproject commit b9c850feae43430e71c9eb21d9475d40263fce94 diff --git a/c_wrapper/src/player.cpp b/c_wrapper/src/player.cpp index 41a8fdf9..fb7c30a4 100755 --- a/c_wrapper/src/player.cpp +++ b/c_wrapper/src/player.cpp @@ -68,7 +68,7 @@ API_EXPORT PlayerContext API_CALL createPlayer() { MediaPlayer::Ptr ret(new MediaPlayer()); s_mapPlayer.emplace(ret.get(), ret); if(s_mapPlayer.size() > 16){ - FatalL << s_mapPlayer.size(); + ErrorL << s_mapPlayer.size(); } return ret.get(); } diff --git a/src/MediaFile/MediaReader.cpp b/src/MediaFile/MediaReader.cpp index 3dfd1ec1..33522ab5 100644 --- a/src/MediaFile/MediaReader.cpp +++ b/src/MediaFile/MediaReader.cpp @@ -226,7 +226,7 @@ inline bool MediaReader::readVideoSample(int iTimeInc) { break; } }else{ - FatalL << "读取视频失败:" << iIdx + 1; + ErrorL << "读取视频失败:" << iIdx + 1; } } m_video_current = iIdx; @@ -248,7 +248,7 @@ inline bool MediaReader::readAudioSample(int iTimeInc) { writeAAC(m_adts.data, m_adts.aac_frame_length, (double) m_audio_ms * i / m_audio_num_samples); } }else{ - FatalL << "读取音频失败:" << i+ 1; + ErrorL << "读取音频失败:" << i+ 1; } } m_audio_current = iNextSample; diff --git a/src/Player/Player.cpp b/src/Player/Player.cpp index 0e3749e9..e73160cf 100644 --- a/src/Player/Player.cpp +++ b/src/Player/Player.cpp @@ -132,6 +132,6 @@ bool getAVCInfo(const string& strSps,int &iVideoWidth, int &iVideoHeight, float } h264GetWidthHeight(&tH264SpsInfo, &iVideoWidth, &iVideoHeight); h264GeFramerate(&tH264SpsInfo, &iVideoFps); - //FatalL << iVideoWidth << " " << iVideoHeight << " " << iVideoFps; + //ErrorL << iVideoWidth << " " << iVideoHeight << " " << iVideoFps; return true; } diff --git a/tests/test_benchmark.cpp b/tests/test_benchmark.cpp index e145d8cd..a641ca18 100644 --- a/tests/test_benchmark.cpp +++ b/tests/test_benchmark.cpp @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) { Logger::Instance().setWriter(std::make_shared()); if (argc != 5) { - FatalL << "\r\n测试方法:./test_benchmark player_count play_interval rtxp_url rtp_type\r\n" + ErrorL << "\r\n测试方法:./test_benchmark player_count play_interval rtxp_url rtp_type\r\n" << "例如你想每隔50毫秒启动共计100个播放器（tcp方式播放rtsp://127.0.0.1/live/0 ）可以输入以下命令:\r\n" << "./test_benchmark 100 50 rtsp://127.0.0.1/live/0 0\r\n" << endl; diff --git a/tests/test_httpApi.cpp b/tests/test_httpApi.cpp index f9418dfc..774484d6 100644 --- a/tests/test_httpApi.cpp +++ b/tests/test_httpApi.cpp @@ -106,7 +106,7 @@ int main(int argc,char *argv[]){ //加载证书，证书包含公钥和私钥 SSL_Initor::Instance().loadServerPem((exePath() + ".pem").data()); }catch(...){ - FatalL << "请把证书:" << (exeName() + ".pem") << "放置在本程序可执行程序同目录下:" << exeDir() << endl; + ErrorL << "请把证书:" << (exeName() + ".pem") << "放置在本程序可执行程序同目录下:" << exeDir() << endl; return 0; } #endif //ENABLE_OPENSSL diff --git a/tests/test_player.cpp b/tests/test_player.cpp index 7af44be9..4bf2f085 100644 --- a/tests/test_player.cpp +++ b/tests/test_player.cpp @@ -52,7 +52,7 @@ int main(int argc, char *argv[]){ Logger::Instance().setWriter(std::make_shared()); if(argc != 3){ - FatalL << "\r\n测试方法：./test_player rtxp_url rtp_type\r\n" + ErrorL << "\r\n测试方法：./test_player rtxp_url rtp_type\r\n" << "例如：./test_player rtsp://admin:123456@127.0.0.1/live/0 0\r\n" <