mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Fix misspelling error in app config. v6.0.133 (#4077)
1. misspelling fix; 2. remove finished TODO; --------- Co-authored-by: Haibo Chen <495810242@qq.com>
This commit is contained in:
parent
7ab012c60f
commit
75ddd8f5b6
14 changed files with 156 additions and 155 deletions
|
@ -37,7 +37,7 @@ SrsMessageHeader::SrsMessageHeader()
|
|||
|
||||
timestamp = 0;
|
||||
// we always use the connection chunk-id
|
||||
perfer_cid = RTMP_CID_OverConnection;
|
||||
prefer_cid = RTMP_CID_OverConnection;
|
||||
}
|
||||
|
||||
SrsMessageHeader::~SrsMessageHeader()
|
||||
|
@ -113,7 +113,7 @@ void SrsMessageHeader::initialize_amf0_script(int size, int stream)
|
|||
stream_id = (int32_t)stream;
|
||||
|
||||
// amf0 script use connection2 chunk-id
|
||||
perfer_cid = RTMP_CID_OverConnection2;
|
||||
prefer_cid = RTMP_CID_OverConnection2;
|
||||
}
|
||||
|
||||
void SrsMessageHeader::initialize_audio(int size, uint32_t time, int stream)
|
||||
|
@ -125,7 +125,7 @@ void SrsMessageHeader::initialize_audio(int size, uint32_t time, int stream)
|
|||
stream_id = (int32_t)stream;
|
||||
|
||||
// audio chunk-id
|
||||
perfer_cid = RTMP_CID_Audio;
|
||||
prefer_cid = RTMP_CID_Audio;
|
||||
}
|
||||
|
||||
void SrsMessageHeader::initialize_video(int size, uint32_t time, int stream)
|
||||
|
@ -137,7 +137,7 @@ void SrsMessageHeader::initialize_video(int size, uint32_t time, int stream)
|
|||
stream_id = (int32_t)stream;
|
||||
|
||||
// video chunk-id
|
||||
perfer_cid = RTMP_CID_Video;
|
||||
prefer_cid = RTMP_CID_Video;
|
||||
}
|
||||
|
||||
SrsCommonMessage::SrsCommonMessage()
|
||||
|
@ -175,7 +175,7 @@ SrsSharedMessageHeader::SrsSharedMessageHeader()
|
|||
{
|
||||
payload_length = 0;
|
||||
message_type = 0;
|
||||
perfer_cid = 0;
|
||||
prefer_cid = 0;
|
||||
}
|
||||
|
||||
SrsSharedMessageHeader::~SrsSharedMessageHeader()
|
||||
|
@ -244,7 +244,7 @@ srs_error_t SrsSharedPtrMessage::create(SrsMessageHeader* pheader, char* payload
|
|||
if (pheader) {
|
||||
ptr->header.message_type = pheader->message_type;
|
||||
ptr->header.payload_length = size;
|
||||
ptr->header.perfer_cid = pheader->perfer_cid;
|
||||
ptr->header.prefer_cid = pheader->prefer_cid;
|
||||
this->timestamp = pheader->timestamp;
|
||||
this->stream_id = pheader->stream_id;
|
||||
}
|
||||
|
@ -284,9 +284,9 @@ bool SrsSharedPtrMessage::check(int stream_id)
|
|||
|
||||
// we donot use the complex basic header,
|
||||
// ensure the basic header is 1bytes.
|
||||
if (ptr->header.perfer_cid < 2 || ptr->header.perfer_cid > 63) {
|
||||
srs_info("change the chunk_id=%d to default=%d", ptr->header.perfer_cid, RTMP_CID_ProtocolControl);
|
||||
ptr->header.perfer_cid = RTMP_CID_ProtocolControl;
|
||||
if (ptr->header.prefer_cid < 2 || ptr->header.prefer_cid > 63) {
|
||||
srs_info("change the chunk_id=%d to default=%d", ptr->header.prefer_cid, RTMP_CID_ProtocolControl);
|
||||
ptr->header.prefer_cid = RTMP_CID_ProtocolControl;
|
||||
}
|
||||
|
||||
// we assume that the stream_id in a group must be the same.
|
||||
|
@ -317,10 +317,10 @@ bool SrsSharedPtrMessage::is_video()
|
|||
int SrsSharedPtrMessage::chunk_header(char* cache, int nb_cache, bool c0)
|
||||
{
|
||||
if (c0) {
|
||||
return srs_chunk_header_c0(ptr->header.perfer_cid, (uint32_t)timestamp,
|
||||
return srs_chunk_header_c0(ptr->header.prefer_cid, (uint32_t)timestamp,
|
||||
ptr->header.payload_length, ptr->header.message_type, stream_id, cache, nb_cache);
|
||||
} else {
|
||||
return srs_chunk_header_c3(ptr->header.perfer_cid, (uint32_t)timestamp,
|
||||
return srs_chunk_header_c3(ptr->header.prefer_cid, (uint32_t)timestamp,
|
||||
cache, nb_cache);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue