hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed all ARM-related issues/warnings/etc

Browse source
This commit is contained in:
Thulinma 2021-05-21 17:54:24 +02:00
parent dae32ede11
commit 6733bf2a20
44 changed files with 123 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/analysers/analyser_h264.cpp
View file

@ -39,7 +39,7 @@ bool AnalyserH264::parsePacket(){
FAIL_MSG("Could not read a NAL unit at position %" PRIu64, prePos);
return false;
}
HIGH_MSG("Read a %lu-byte NAL unit at position %" PRIu64, size, prePos);
HIGH_MSG("Read a %zu-byte NAL unit at position %" PRIu64, size, prePos);
if (detail >= 2){nalPtr->toPrettyString(std::cout);}
//SPS unit? Find the FPS, if any.
if (nalPtr->getType() == 7){

2
src/analysers/analyser_hls.cpp
View file

@ -105,7 +105,7 @@ bool AnalyserHLS::parsePacket(){
if (!DL.get(part.uri)){return false;}
if (DL.getHeader("Content-Length") != ""){
if (DL.data().size() != atoi(DL.getHeader("Content-Length").c_str())){
FAIL_MSG("Expected %s bytes of data, but only received %lu.",
FAIL_MSG("Expected %s bytes of data, but only received %zu.",
DL.getHeader("Content-Length").c_str(), DL.data().size());
return false;
}

4
src/analysers/analyser_ogg.cpp
View file

@ -28,10 +28,10 @@ bool AnalyserOGG::parsePacket(){
sn2Codec[oggPage.getBitstreamSerialNumber()] = "Opus";
}
if (sn2Codec[oggPage.getBitstreamSerialNumber()] != ""){
INFO_MSG("Bitstream %" PRIu64 " recognized as %s", oggPage.getBitstreamSerialNumber(),
INFO_MSG("Bitstream %" PRIu32 " recognized as %s", oggPage.getBitstreamSerialNumber(),
sn2Codec[oggPage.getBitstreamSerialNumber()].c_str());
}else{
WARN_MSG("Bitstream %" PRIu64 " not recognized!", oggPage.getBitstreamSerialNumber());
WARN_MSG("Bitstream %" PRIu32 " not recognized!", oggPage.getBitstreamSerialNumber());
}
}

12
src/analysers/analyser_rtmp.cpp
View file

@ -67,17 +67,17 @@ bool AnalyserRTMP::parsePacket(){
}
// We now know for sure that we've parsed a packet
DETAIL_HI("Chunk info: [%#2X] CS ID %u, timestamp %u, len %u, type ID %u, Stream ID %u",
DETAIL_HI("Chunk info: [%#2X] CS ID %u, timestamp %" PRIu64 ", len %u, type ID %u, Stream ID %u",
next.headertype, next.cs_id, next.timestamp, next.len, next.msg_type_id, next.msg_stream_id);
switch (next.msg_type_id){
case 0: // does not exist
DETAIL_LOW("Error chunk @ %lu - CS%i, T%i, L%i, LL%i, MID%i", read_in - strbuf.size(),
DETAIL_LOW("Error chunk @ %zu - CS%u, T%" PRIu64 ", L%i, LL%i, MID%i", read_in - strbuf.size(),
next.cs_id, next.timestamp, next.real_len, next.len_left, next.msg_stream_id);
return 0;
break; // happens when connection breaks unexpectedly
case 1: // set chunk size
RTMPStream::chunk_rec_max = ntohl(*(int *)next.data.c_str());
DETAIL_MED("CTRL: Set chunk size: %" PRIu64, RTMPStream::chunk_rec_max);
DETAIL_MED("CTRL: Set chunk size: %zu", RTMPStream::chunk_rec_max);
break;
case 2: // abort message - we ignore this one
DETAIL_MED("CTRL: Abort message: %" PRIu32, Bit::btohl(next.data.data()));
@ -85,7 +85,7 @@ bool AnalyserRTMP::parsePacket(){
break;
case 3: // ack
RTMPStream::snd_window_at = Bit::btohl(next.data.data());
DETAIL_MED("CTRL: Acknowledgement: %" PRIu64, RTMPStream::snd_window_at);
DETAIL_MED("CTRL: Acknowledgement: %zu", RTMPStream::snd_window_at);
break;
case 4:{
int16_t ucmtype = Bit::btohs(next.data.data());
@ -124,12 +124,12 @@ bool AnalyserRTMP::parsePacket(){
case 5: // window size of other end
RTMPStream::rec_window_size = Bit::btohl(next.data.data());
RTMPStream::rec_window_at = RTMPStream::rec_cnt;
DETAIL_MED("CTRL: Window size: %" PRIu64, RTMPStream::rec_window_size);
DETAIL_MED("CTRL: Window size: %zu", RTMPStream::rec_window_size);
break;
case 6:
RTMPStream::snd_window_size = Bit::btohl(next.data.data());
// 4 bytes window size, 1 byte limit type (ignored)
DETAIL_MED("CTRL: Set peer bandwidth: %" PRIu64, RTMPStream::snd_window_size);
DETAIL_MED("CTRL: Set peer bandwidth: %zu", RTMPStream::snd_window_size);
break;
case 8:
case 9: