format code and remove some useless code

This commit is contained in:
xiongguangjie
2022-06-06 20:40:04 +08:00
parent 83d75c9a72
commit c92fc8a4a8
19 changed files with 715 additions and 762 deletions

View File

@@ -2,8 +2,7 @@
#define ZLMEDIAKIT_SRT_ACK_H
#include "Packet.hpp"
namespace SRT{
namespace SRT {
/*
0 1 2 3
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -33,16 +32,13 @@ namespace SRT{
Figure 13: ACK control packet
https://haivision.github.io/srt-rfc/draft-sharabayko-srt.html#name-ack-acknowledgment
*/
class ACKPacket : public ControlPacket
{
class ACKPacket : public ControlPacket {
public:
using Ptr = std::shared_ptr<ACKPacket>;
ACKPacket() = default;
~ACKPacket() = default;
enum{
ACK_CIF_SIZE = 7*4
};
enum { ACK_CIF_SIZE = 7 * 4 };
std::string dump();
///////ControlPacket override///////
bool loadFromData(uint8_t *buf, size_t len) override;
@@ -59,15 +55,14 @@ public:
uint32_t recv_rate;
};
class ACKACKPacket : public ControlPacket{
class ACKACKPacket : public ControlPacket {
public:
using Ptr = std::shared_ptr<ACKACKPacket>;
ACKACKPacket() = default;
~ACKACKPacket() = default;
///////ControlPacket override///////
bool loadFromData(uint8_t *buf, size_t len) override{
if(len < ControlPacket::HEADER_SIZE){
bool loadFromData(uint8_t *buf, size_t len) override {
if (len < ControlPacket::HEADER_SIZE) {
return false;
}
_data = BufferRaw::create();
@@ -76,21 +71,20 @@ public:
ack_number = loadUint32(type_specific_info);
return true;
}
bool storeToData() override{
bool storeToData() override {
_data = BufferRaw::create();
_data->setCapacity(HEADER_SIZE);
_data->setSize(HEADER_SIZE );
_data->setSize(HEADER_SIZE);
control_type = ControlPacket::ACKACK;
sub_type = 0;
storeUint32(type_specific_info,ack_number);
storeUint32(type_specific_info, ack_number);
storeToHeader();
return true;
}
uint32_t ack_number;
};
} //namespace SRT
} // namespace SRT
#endif // ZLMEDIAKIT_SRT_ACK_H