external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215

Browse source
This commit is contained in:
winlin 2014-09-26 16:34:13 +08:00
parent 4a323e64c4
commit 002facb85b
21 changed files with 73 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/rtmp/srs_protocol_amf0.cpp
View file

@ -367,8 +367,6 @@ int SrsAmf0Any::discovery(SrsStream* stream, SrsAmf0Any** ppvalue)
return ret;
}
}
return ret;
}
SrsUnSortedHashtable::SrsUnSortedHashtable()
@ -1428,11 +1426,7 @@ int srs_amf0_read_boolean(SrsStream* stream, bool& value)
return ret;
}
if (stream->read_1bytes() == 0) {
value = false;
} else {
value = true;
}
value = (stream->read_1bytes() != 0);
srs_verbose("amf0 read bool value success. value=%d", value);

4
trunk/src/rtmp/srs_protocol_handshake.cpp
View file

@ -947,7 +947,7 @@ namespace _srs_internal
// directly generate the public key.
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/148
int pkey_size = 128;
if ((ret = dh.copy_public_key((char*)block0.key.key, pkey_size)) != ERROR_SUCCESS) {
if ((ret = dh.copy_public_key(block0.key.key, pkey_size)) != ERROR_SUCCESS) {
srs_error("calc s1 key failed. ret=%d", ret);
return ret;
}
@ -959,7 +959,7 @@ namespace _srs_internal
// directly generate the public key.
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/148
int pkey_size = 128;
if ((ret = dh.copy_public_key((char*)block1.key.key, pkey_size)) != ERROR_SUCCESS) {
if ((ret = dh.copy_public_key(block1.key.key, pkey_size)) != ERROR_SUCCESS) {
srs_error("calc s1 key failed. ret=%d", ret);
return ret;
}

1
trunk/src/rtmp/srs_protocol_rtmp.cpp
View file

@ -172,7 +172,6 @@ string srs_client_type_string(SrsRtmpConnType type)
case SrsRtmpConnFMLEPublish: return "publish(FMLEPublish)";
default: return "Unknown";
}
return "Unknown";
}
SrsHandshakeBytes::SrsHandshakeBytes()

34
trunk/src/rtmp/srs_protocol_stack.cpp
View file

@ -517,7 +517,7 @@ int SrsProtocol::decode_message(SrsMessage* msg, SrsPacket** ppacket)
// initialize the decode stream for all message,
// it's ok for the initialize if fast and without memory copy.
if ((ret = stream.initialize((char*)(msg->payload), msg->size)) != ERROR_SUCCESS) {
if ((ret = stream.initialize(msg->payload, msg->size)) != ERROR_SUCCESS) {
srs_error("initialize stream failed. ret=%d", ret);
return ret;
}
@ -552,7 +552,7 @@ int SrsProtocol::do_send_message(SrsMessage* msg, SrsPacket* packet)
// p set to current write position,
// it's ok when payload is NULL and size is 0.
char* p = (char*)msg->payload;
char* p = msg->payload;
// to directly set the field.
char* pp = NULL;
@ -561,7 +561,7 @@ int SrsProtocol::do_send_message(SrsMessage* msg, SrsPacket* packet)
// generate the header.
char* pheader = out_header_cache;
if (p == (char*)msg->payload) {
if (p == msg->payload) {
// write new chunk stream header, fmt is 0
*pheader++ = 0x00 | (msg->header.perfer_cid & 0x3F);
@ -634,7 +634,7 @@ int SrsProtocol::do_send_message(SrsMessage* msg, SrsPacket* packet)
// sendout header and payload by writev.
// decrease the sys invoke count to get higher performance.
int payload_size = msg->size - (p - (char*)msg->payload);
int payload_size = msg->size - (p - msg->payload);
payload_size = srs_min(payload_size, out_chunk_size);
// always has header
@ -658,7 +658,7 @@ int SrsProtocol::do_send_message(SrsMessage* msg, SrsPacket* packet)
if (msg->payload && msg->size > 0) {
p += payload_size;
}
} while (p < (char*)msg->payload + msg->size);
} while (p < msg->payload + msg->size);
// only process the callback event when with packet
if (packet && (ret = on_send_packet(msg, packet)) != ERROR_SUCCESS) {
@ -878,7 +878,7 @@ int SrsProtocol::send_and_free_packet(SrsPacket* packet, int stream_id)
msg->header.payload_length = size;
msg->header.message_type = packet->get_message_type();
msg->header.stream_id = stream_id;
msg->header.perfer_cid = packet->get_perfer_cid();
msg->header.perfer_cid = packet->get_prefer_cid();
// donot use the auto free to free the msg,
// for performance issue.
@ -1527,6 +1527,8 @@ int SrsProtocol::on_recv_message(SrsMessage* msg)
}
break;
}
default:
break;
}
return ret;
@ -1574,6 +1576,8 @@ int SrsProtocol::on_send_packet(SrsMessage* msg, SrsPacket* packet)
}
break;
}
default:
break;
}
return ret;
@ -1669,7 +1673,7 @@ int SrsSharedPtrMessage::create(SrsMessage* msg)
{
int ret = ERROR_SUCCESS;
if ((ret = create(&msg->header, (char*)msg->payload, msg->size)) != ERROR_SUCCESS) {
if ((ret = create(&msg->header, msg->payload, msg->size)) != ERROR_SUCCESS) {
return ret;
}
@ -1786,7 +1790,7 @@ int SrsPacket::decode(SrsStream* stream)
return ret;
}
int SrsPacket::get_perfer_cid()
int SrsPacket::get_prefer_cid()
{
return 0;
}
@ -2914,7 +2918,7 @@ int SrsPlayPacket::decode(SrsStream* stream)
if (reset_value->is_boolean()) {
reset = reset_value->to_boolean();
} else if (reset_value->is_number()) {
reset = (reset_value->to_number() == 0 ? false : true);
reset = (reset_value->to_number() != 0);
} else {
ret = ERROR_RTMP_AMF0_DECODE;
srs_error("amf0 invalid type=%#x, requires number or bool, ret=%d", reset_value->marker, ret);
@ -3565,7 +3569,7 @@ int SrsOnMetaDataPacket::decode(SrsStream* stream)
return ret;
}
int SrsOnMetaDataPacket::get_perfer_cid()
int SrsOnMetaDataPacket::get_prefer_cid()
{
return RTMP_CID_OverConnection2;
}
@ -3625,7 +3629,7 @@ int SrsSetWindowAckSizePacket::decode(SrsStream* stream)
return ret;
}
int SrsSetWindowAckSizePacket::get_perfer_cid()
int SrsSetWindowAckSizePacket::get_prefer_cid()
{
return RTMP_CID_ProtocolControl;
}
@ -3667,7 +3671,7 @@ SrsAcknowledgementPacket::~SrsAcknowledgementPacket()
{
}
int SrsAcknowledgementPacket::get_perfer_cid()
int SrsAcknowledgementPacket::get_prefer_cid()
{
return RTMP_CID_ProtocolControl;
}
@ -3725,7 +3729,7 @@ int SrsSetChunkSizePacket::decode(SrsStream* stream)
return ret;
}
int SrsSetChunkSizePacket::get_perfer_cid()
int SrsSetChunkSizePacket::get_prefer_cid()
{
return RTMP_CID_ProtocolControl;
}
@ -3767,7 +3771,7 @@ SrsSetPeerBandwidthPacket::~SrsSetPeerBandwidthPacket()
{
}
int SrsSetPeerBandwidthPacket::get_perfer_cid()
int SrsSetPeerBandwidthPacket::get_prefer_cid()
{
return RTMP_CID_ProtocolControl;
}
@ -3841,7 +3845,7 @@ int SrsUserControlPacket::decode(SrsStream* stream)
return ret;
}
int SrsUserControlPacket::get_perfer_cid()
int SrsUserControlPacket::get_prefer_cid()
{
return RTMP_CID_ProtocolControl;
}

14
trunk/src/rtmp/srs_protocol_stack.hpp
View file

@ -534,7 +534,7 @@ public:
* all protocol control messages perfer RTMP_CID_ProtocolControl,
* SrsSetWindowAckSizePacket is protocol control message.
*/
virtual int get_perfer_cid();
virtual int get_prefer_cid();
/**
* subpacket must override to provide the right message type.
* the message type set the RTMP message type in header.
@ -1311,7 +1311,7 @@ public:
virtual int decode(SrsStream* stream);
// encode functions for concrete packet to override.
public:
virtual int get_perfer_cid();
virtual int get_prefer_cid();
virtual int get_message_type();
protected:
virtual int get_size();
@ -1335,7 +1335,7 @@ public:
virtual int decode(SrsStream* stream);
// encode functions for concrete packet to override.
public:
virtual int get_perfer_cid();
virtual int get_prefer_cid();
virtual int get_message_type();
protected:
virtual int get_size();
@ -1356,7 +1356,7 @@ public:
virtual ~SrsAcknowledgementPacket();
// encode functions for concrete packet to override.
public:
virtual int get_perfer_cid();
virtual int get_prefer_cid();
virtual int get_message_type();
protected:
virtual int get_size();
@ -1384,7 +1384,7 @@ public:
virtual int decode(SrsStream* stream);
// encode functions for concrete packet to override.
public:
virtual int get_perfer_cid();
virtual int get_prefer_cid();
virtual int get_message_type();
protected:
virtual int get_size();
@ -1417,7 +1417,7 @@ public:
virtual ~SrsSetPeerBandwidthPacket();
// encode functions for concrete packet to override.
public:
virtual int get_perfer_cid();
virtual int get_prefer_cid();
virtual int get_message_type();
protected:
virtual int get_size();
@ -1540,7 +1540,7 @@ public:
virtual int decode(SrsStream* stream);
// encode functions for concrete packet to override.
public:
virtual int get_perfer_cid();
virtual int get_prefer_cid();
virtual int get_message_type();
protected:
virtual int get_size();