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

Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit

Browse Source
This commit is contained in:
ziyue 2022-04-28 17:26:05 +08:00
commit 85399015f9
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Rtmp/RtmpPlayer.cpp
View File

@ -214,7 +214,7 @@ inline void RtmpPlayer::send_createStream() {
inline void RtmpPlayer::send_play() { inline void RtmpPlayer::send_play() {
AMFEncoder enc; AMFEncoder enc;
enc << "play" << ++_send_req_id << nullptr << _stream_id << (double) _stream_index; enc << "play" << ++_send_req_id << nullptr << _stream_id << "-2000";
sendRequest(MSG_CMD, enc.data()); sendRequest(MSG_CMD, enc.data());
auto fun = [](AMFValue &val) { auto fun = [](AMFValue &val) {
//TraceL << "play onStatus"; //TraceL << "play onStatus";
@ -297,7 +297,8 @@ void RtmpPlayer::onCmd_onStatus(AMFDecoder &dec) {
auto level = val["level"]; auto level = val["level"];
auto code = val["code"].as_string(); auto code = val["code"].as_string();
if (level.type() == AMF_STRING) { if (level.type() == AMF_STRING) {
if (level.as_string() != "status") { // warning 不应该断开
if (level.as_string() != "status" && level.as_string() != "warning") {
throw std::runtime_error(StrPrinter << "onStatus 失败:" << level.as_string() << " " << code << endl); throw std::runtime_error(StrPrinter << "onStatus 失败:" << level.as_string() << " " << code << endl);
} }
} }

10
src/Rtmp/RtmpProtocol.cpp
View File

@ -766,6 +766,9 @@ void RtmpProtocol::handle_chunk(RtmpPacket::Ptr packet) {
case MSG_AGGREGATE: { case MSG_AGGREGATE: {
auto ptr = (uint8_t *) chunk_data.buffer.data(); auto ptr = (uint8_t *) chunk_data.buffer.data();
auto ptr_tail = ptr + chunk_data.buffer.size(); auto ptr_tail = ptr + chunk_data.buffer.size();
uint32_t latest_ts, timestamp;
timestamp = chunk_data.time_stamp;
bool first_message = true;
while (ptr + 8 + 3 < ptr_tail) { while (ptr + 8 + 3 < ptr_tail) {
auto type = *ptr; auto type = *ptr;
ptr += 1; ptr += 1;
@ -781,12 +784,17 @@ void RtmpProtocol::handle_chunk(RtmpPacket::Ptr packet) {
if (ptr + size > ptr_tail) { if (ptr + size > ptr_tail) {
break; break;
} }
if (!first_message) {
timestamp += ts - latest_ts;
}
first_message = false;
latest_ts = ts;
auto sub_packet_ptr = RtmpPacket::create(); auto sub_packet_ptr = RtmpPacket::create();
auto &sub_packet = *sub_packet_ptr; auto &sub_packet = *sub_packet_ptr;
sub_packet.buffer.assign((char *)ptr, size); sub_packet.buffer.assign((char *)ptr, size);
sub_packet.type_id = type; sub_packet.type_id = type;
sub_packet.body_size = size; sub_packet.body_size = size;
sub_packet.time_stamp = ts; sub_packet.time_stamp = timestamp;
sub_packet.stream_index = chunk_data.stream_index; sub_packet.stream_index = chunk_data.stream_index;
sub_packet.chunk_id = chunk_data.chunk_id; sub_packet.chunk_id = chunk_data.chunk_id;
handle_chunk(std::move(sub_packet_ptr)); handle_chunk(std::move(sub_packet_ptr));