diff --git a/src/Rtmp/RtmpPlayer.cpp b/src/Rtmp/RtmpPlayer.cpp index bc454b49..fa3ec496 100644 --- a/src/Rtmp/RtmpPlayer.cpp +++ b/src/Rtmp/RtmpPlayer.cpp @@ -214,7 +214,7 @@ inline void RtmpPlayer::send_createStream() { inline void RtmpPlayer::send_play() { 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()); auto fun = [](AMFValue &val) { //TraceL << "play onStatus"; @@ -297,7 +297,8 @@ void RtmpPlayer::onCmd_onStatus(AMFDecoder &dec) { auto level = val["level"]; auto code = val["code"].as_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); } } diff --git a/src/Rtmp/RtmpProtocol.cpp b/src/Rtmp/RtmpProtocol.cpp index 246734fc..5eedb291 100644 --- a/src/Rtmp/RtmpProtocol.cpp +++ b/src/Rtmp/RtmpProtocol.cpp @@ -766,6 +766,9 @@ void RtmpProtocol::handle_chunk(RtmpPacket::Ptr packet) { case MSG_AGGREGATE: { auto ptr = (uint8_t *) chunk_data.buffer.data(); 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) { auto type = *ptr; ptr += 1; @@ -781,12 +784,17 @@ void RtmpProtocol::handle_chunk(RtmpPacket::Ptr packet) { if (ptr + size > ptr_tail) { break; } + if (!first_message) { + timestamp += ts - latest_ts; + } + first_message = false; + latest_ts = ts; auto sub_packet_ptr = RtmpPacket::create(); auto &sub_packet = *sub_packet_ptr; sub_packet.buffer.assign((char *)ptr, size); sub_packet.type_id = type; 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.chunk_id = chunk_data.chunk_id; handle_chunk(std::move(sub_packet_ptr));