amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-12-05 09:21:59 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

优化代码

Browse Source 
除1024改成右移10位
This commit is contained in:
xia-chu 2024-11-29 23:07:02 +08:00
parent 67668c9f2c
commit 87b42ab492
13 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/source/mk_util.cpp
View File

@ -196,7 +196,7 @@ API_EXPORT void API_CALL mk_get_statistic(on_mk_get_statistic_cb func, void *use
#ifdef ENABLE_MEM_DEBUG #ifdef ENABLE_MEM_DEBUG
auto bytes = getTotalMemUsage(); auto bytes = getTotalMemUsage();
val["memory.memUsage"] = bytes; val["memory.memUsage"] = bytes;
val["memory.memUsageMB"] = (int)(bytes / 1024 / 1024); val["memory.memUsageMB"] = (int)(bytes >> 20);
val["memory.memBlock"] = getTotalMemBlock(); val["memory.memBlock"] = getTotalMemBlock();
static auto block_type_size = getBlockTypeSize(); static auto block_type_size = getBlockTypeSize();
{ {
@ -240,7 +240,7 @@ API_EXPORT void API_CALL mk_get_statistic(on_mk_get_statistic_cb func, void *use
#ifdef ENABLE_MEM_DEBUG #ifdef ENABLE_MEM_DEBUG
auto bytes = getThisThreadMemUsage(); auto bytes = getThisThreadMemUsage();
val["memUsage"] = bytes; val["memUsage"] = bytes;
val["memUsageMB"] = bytes / 1024 / 1024; val["memUsageMB"] = bytes >> 20;
val["memBlock"] = getThisThreadMemBlock(); val["memBlock"] = getThisThreadMemBlock();
{ {
int i = 0; int i = 0;

2
ext-codec/AAC.cpp
View File

@ -377,7 +377,7 @@ Sdp::Ptr AACTrack::getSdp(uint8_t payload_type) const {
WarnL << getCodecName() << " Track未准备好"; WarnL << getCodecName() << " Track未准备好";
return nullptr; return nullptr;
} }
return std::make_shared<AACSdp>(getExtraData()->toString(), payload_type, getAudioSampleRate(), getAudioChannel(), getBitRate() / 1024); return std::make_shared<AACSdp>(getExtraData()->toString(), payload_type, getAudioSampleRate(), getAudioChannel(), getBitRate() >> 10);
} }
namespace { namespace {

2
ext-codec/H264.cpp
View File

@ -361,7 +361,7 @@ Sdp::Ptr H264Track::getSdp(uint8_t payload_type) const {
WarnL << getCodecName() << " Track未准备好"; WarnL << getCodecName() << " Track未准备好";
return nullptr; return nullptr;
} }
return std::make_shared<H264Sdp>(_sps, _pps, payload_type, getBitRate() / 1024); return std::make_shared<H264Sdp>(_sps, _pps, payload_type, getBitRate() >> 10);
} }
namespace { namespace {

2
ext-codec/H265.cpp
View File

@ -267,7 +267,7 @@ Sdp::Ptr H265Track::getSdp(uint8_t payload_type) const {
WarnL << getCodecName() << " Track未准备好"; WarnL << getCodecName() << " Track未准备好";
return nullptr; return nullptr;
} }
return std::make_shared<H265Sdp>(_vps, _sps, _pps, payload_type, getBitRate() / 1024); return std::make_shared<H265Sdp>(_vps, _sps, _pps, payload_type, getBitRate() >> 10);
} }
namespace { namespace {

2
ext-codec/JPEG.cpp
View File

@ -47,7 +47,7 @@ private:
}; };
Sdp::Ptr JPEGTrack::getSdp(uint8_t) const { Sdp::Ptr JPEGTrack::getSdp(uint8_t) const {
return std::make_shared<JPEGSdp>(getBitRate() / 1024); return std::make_shared<JPEGSdp>(getBitRate() >> 10);
} }

2
ext-codec/L16.cpp
View File

@ -61,7 +61,7 @@ Sdp::Ptr L16Track::getSdp(uint8_t payload_type) const {
WarnL << getCodecName() << " Track未准备好"; WarnL << getCodecName() << " Track未准备好";
return nullptr; return nullptr;
} }
return std::make_shared<L16Sdp>(payload_type, getAudioSampleRate(), getAudioChannel(), getBitRate() / 1024); return std::make_shared<L16Sdp>(payload_type, getAudioSampleRate(), getAudioChannel(), getBitRate() >> 10);
} }
Track::Ptr L16Track::clone() const { Track::Ptr L16Track::clone() const {

2
ext-codec/Opus.cpp
View File

@ -62,7 +62,7 @@ Sdp::Ptr OpusTrack::getSdp(uint8_t payload_type) const {
WarnL << getCodecName() << " Track未准备好"; WarnL << getCodecName() << " Track未准备好";
return nullptr; return nullptr;
} }
return std::make_shared<OpusSdp>(payload_type, getAudioSampleRate(), getAudioChannel(), getBitRate() / 1024); return std::make_shared<OpusSdp>(payload_type, getAudioSampleRate(), getAudioChannel(), getBitRate() >> 10);
} }
namespace { namespace {

4
server/WebApi.cpp
View File

@ -570,7 +570,7 @@ void getStatisticJson(const function<void(Value &val)> &cb) {
#ifdef ENABLE_MEM_DEBUG #ifdef ENABLE_MEM_DEBUG
auto bytes = getTotalMemUsage(); auto bytes = getTotalMemUsage();
val["totalMemUsage"] = (Json::UInt64) bytes; val["totalMemUsage"] = (Json::UInt64) bytes;
val["totalMemUsageMB"] = (int) (bytes / 1024 / 1024); val["totalMemUsageMB"] = (int) (bytes >> 20);
val["totalMemBlock"] = (Json::UInt64) getTotalMemBlock(); val["totalMemBlock"] = (Json::UInt64) getTotalMemBlock();
static auto block_type_size = getBlockTypeSize(); static auto block_type_size = getBlockTypeSize();
{ {
@ -604,7 +604,7 @@ void getStatisticJson(const function<void(Value &val)> &cb) {
auto bytes = getThisThreadMemUsage(); auto bytes = getThisThreadMemUsage();
val["threadName"] = getThreadName(); val["threadName"] = getThreadName();
val["threadMemUsage"] = (Json::UInt64) bytes; val["threadMemUsage"] = (Json::UInt64) bytes;
val["threadMemUsageMB"] = (Json::UInt64) (bytes / 1024 / 1024); val["threadMemUsageMB"] = (Json::UInt64) (bytes >> 20);
val["threadMemBlock"] = (Json::UInt64) getThisThreadMemBlock(); val["threadMemBlock"] = (Json::UInt64) getThisThreadMemBlock();
{ {
int i = 0; int i = 0;

4
src/Http/HttpFileManager.cpp
View File

@ -284,9 +284,9 @@ static bool makeFolderMenu(const string &httpPath, const string &strFullPath, st
} else if (fileSize < 1024 * 1024) { } else if (fileSize < 1024 * 1024) {
ss << fixed << setprecision(2) << " (" << fileSize / 1024.0 << "KB)"; ss << fixed << setprecision(2) << " (" << fileSize / 1024.0 << "KB)";
} else if (fileSize < 1024 * 1024 * 1024) { } else if (fileSize < 1024 * 1024 * 1024) {
ss << fixed << setprecision(2) << " (" << fileSize / 1024 / 1024.0 << "MB)"; ss << fixed << setprecision(2) << " (" << (fileSize >> 10) / 1024.0 << "MB)";
} else { } else {
ss << fixed << setprecision(2) << " (" << fileSize / 1024 / 1024 / 1024.0 << "GB)"; ss << fixed << setprecision(2) << " (" << (fileSize >> 20) / 1024.0 << "GB)";
} }
ss << "</a></li>\r\n"; ss << "</a></li>\r\n";
} }

4
src/Rtmp/Rtmp.cpp
View File

@ -34,14 +34,14 @@ VideoMeta::VideoMeta(const VideoTrack::Ptr &video) {
_metadata.set("framerate", video->getVideoFps()); _metadata.set("framerate", video->getVideoFps());
} }
if (video->getBitRate()) { if (video->getBitRate()) {
_metadata.set("videodatarate", video->getBitRate() / 1024); _metadata.set("videodatarate", video->getBitRate() >> 10);
} }
_metadata.set("videocodecid", Factory::getAmfByCodecId(video->getCodecId())); _metadata.set("videocodecid", Factory::getAmfByCodecId(video->getCodecId()));
} }
AudioMeta::AudioMeta(const AudioTrack::Ptr &audio) { AudioMeta::AudioMeta(const AudioTrack::Ptr &audio) {
if (audio->getBitRate()) { if (audio->getBitRate()) {
_metadata.set("audiodatarate", audio->getBitRate() / 1024); _metadata.set("audiodatarate", audio->getBitRate() >> 10);
} }
if (audio->getAudioSampleRate() > 0) { if (audio->getAudioSampleRate() > 0) {
_metadata.set("audiosamplerate", audio->getAudioSampleRate()); _metadata.set("audiosamplerate", audio->getAudioSampleRate());

2
tests/test_flv.cpp
View File

@ -84,7 +84,7 @@ static bool loadFile(const char *path){
} }
timeStamp_last = timeStamp; timeStamp_last = timeStamp;
} }
WarnL << total_size / 1024 << "KB"; WarnL << (total_size >> 10) << "KB";
fclose(fp); fclose(fp);
return true; return true;
} }

2
tests/test_ps.cpp
View File

@ -85,7 +85,7 @@ static bool loadFile(const char *path, const EventPoller::Ptr &poller) {
if (ps_decoder) { if (ps_decoder) {
ps_decoder->input(text, lSize); ps_decoder->input(text, lSize);
} }
WarnL << lSize / 1024 << "KB"; WarnL << (lSize >> 10) << "KB";
fclose(fp); fclose(fp);
return true; return true;
} }

2
tests/test_rtp.cpp
View File

@ -89,7 +89,7 @@ static bool loadFile(const char *path, const EventPoller::Ptr &poller) {
poller->doDelayTask(1, [do_read, total_size, process]() mutable { poller->doDelayTask(1, [do_read, total_size, process]() mutable {
auto ret = do_read(); auto ret = do_read();
if (!ret) { if (!ret) {
WarnL << *total_size / 1024 << "KB"; WarnL << (*total_size >> 10) << "KB";
} }
return ret; return ret;
}); });