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

优化rtmp chunk相关处理代码

Browse Source
This commit is contained in:
xiongziliang 2021-06-22 10:39:16 +08:00
parent 510d908bc4
commit ce2122d3b6
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Rtmp/Rtmp.h
View File

@ -115,7 +115,14 @@ public:
class RtmpHeader { class RtmpHeader {
public: public:
uint8_t flags; #if __BYTE_ORDER == __BIG_ENDIAN
uint8_t fmt : 2;
uint8_t chunk_id : 6;
#else
uint8_t chunk_id : 6;
//0、1、2、3分别对应 12、8、4、1长度
uint8_t fmt : 2;
#endif
uint8_t time_stamp[3]; uint8_t time_stamp[3];
uint8_t body_size[3]; uint8_t body_size[3];
uint8_t type_id; uint8_t type_id;

27
src/Rtmp/RtmpProtocol.cpp
View File

@ -210,7 +210,8 @@ void RtmpProtocol::sendRtmp(uint8_t type, uint32_t stream_index, const Buffer::P
buffer_header->setSize(sizeof(RtmpHeader)); buffer_header->setSize(sizeof(RtmpHeader));
//对rtmp头赋值，如果使用整形赋值，在arm android上可能由于数据对齐导致总线错误的问题 //对rtmp头赋值，如果使用整形赋值，在arm android上可能由于数据对齐导致总线错误的问题
RtmpHeader *header = (RtmpHeader *) buffer_header->data(); RtmpHeader *header = (RtmpHeader *) buffer_header->data();
header->flags = (chunk_id & 0x3f) | (0 << 6); header->fmt = 0;
header->chunk_id = chunk_id;
header->type_id = type; header->type_id = type;
set_be24(header->time_stamp, ext_stamp ? 0xFFFFFF : stamp); set_be24(header->time_stamp, ext_stamp ? 0xFFFFFF : stamp);
set_be24(header->body_size, (uint32_t)buf->size()); set_be24(header->body_size, (uint32_t)buf->size());
@ -232,7 +233,9 @@ void RtmpProtocol::sendRtmp(uint8_t type, uint32_t stream_index, const Buffer::P
BufferRaw::Ptr buffer_flags = obtainBuffer(); BufferRaw::Ptr buffer_flags = obtainBuffer();
buffer_flags->setCapacity(1); buffer_flags->setCapacity(1);
buffer_flags->setSize(1); buffer_flags->setSize(1);
buffer_flags->data()[0] = (chunk_id & 0x3f) | (3 << 6); header = (RtmpHeader *) buffer_flags->data();
header->fmt = 3;
header->chunk_id = chunk_id;
size_t offset = 0; size_t offset = 0;
size_t totalSize = sizeof(RtmpHeader); size_t totalSize = sizeof(RtmpHeader);
@ -523,15 +526,15 @@ const char* RtmpProtocol::handle_C2(const char *data, size_t len) {
return handle_rtmp(data + C1_HANDSHARK_SIZE, len - C1_HANDSHARK_SIZE); return handle_rtmp(data + C1_HANDSHARK_SIZE, len - C1_HANDSHARK_SIZE);
} }
static const size_t HEADER_LENGTH[] = {12, 8, 4, 1}; static constexpr size_t HEADER_LENGTH[] = {12, 8, 4, 1};
const char* RtmpProtocol::handle_rtmp(const char *data, size_t len) { const char* RtmpProtocol::handle_rtmp(const char *data, size_t len) {
auto ptr = data; auto ptr = data;
while (len) { while (len) {
int offset = 0; size_t offset = 0;
uint8_t flags = ptr[0]; auto header = (RtmpHeader *) ptr;
size_t header_len = HEADER_LENGTH[flags >> 6]; auto header_len = HEADER_LENGTH[header->fmt];
_now_chunk_id = flags & 0x3f; _now_chunk_id = header->chunk_id;
switch (_now_chunk_id) { switch (_now_chunk_id) {
case 0: { case 0: {
//0 值表示二字节形式，并且 ID 范围 64 - 319 //0 值表示二字节形式，并且 ID 范围 64 - 319
@ -565,7 +568,7 @@ const char* RtmpProtocol::handle_rtmp(const char *data, size_t len) {
//need more data //need more data
return ptr; return ptr;
} }
RtmpHeader &header = *((RtmpHeader *) (ptr + offset)); header = (RtmpHeader *) (ptr + offset);
auto &pr = _map_chunk_data[_now_chunk_id]; auto &pr = _map_chunk_data[_now_chunk_id];
auto &now_packet = pr.first; auto &now_packet = pr.first;
auto &last_packet = pr.second; auto &last_packet = pr.second;
@ -583,12 +586,12 @@ const char* RtmpProtocol::handle_rtmp(const char *data, size_t len) {
switch (header_len) { switch (header_len) {
case 12: case 12:
chunk_data.is_abs_stamp = true; chunk_data.is_abs_stamp = true;
chunk_data.stream_index = load_le32(header.stream_index); chunk_data.stream_index = load_le32(header->stream_index);
case 8: case 8:
chunk_data.body_size = load_be24(header.body_size); chunk_data.body_size = load_be24(header->body_size);
chunk_data.type_id = header.type_id; chunk_data.type_id = header->type_id;
case 4: case 4:
chunk_data.ts_field = load_be24(header.time_stamp); chunk_data.ts_field = load_be24(header->time_stamp);
} }
auto time_stamp = chunk_data.ts_field; auto time_stamp = chunk_data.ts_field;