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

supprot ps jitbuffer different timestamp of audio and video

Browse source
This commit is contained in:
kyxlx550 2020-07-06 01:33:34 +08:00 • committed by winlin
parent a617d362da
commit 5864ea3472
3 changed files with 73 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

58
trunk/src/app/srs_app_gb28181.cpp
View file

@ -976,8 +976,13 @@ SrsGb28181RtmpMuxer::SrsGb28181RtmpMuxer(SrsGb28181Manger* c, std::string id, bo
source_publish = true;
jitter_buffer = new SrsPsJitterBuffer(id);
jitter_buffer_audio = new SrsPsJitterBuffer(id);
ps_buflen = 0;
ps_buffer = NULL;
ps_buflen_auido = 0;
ps_buffer_audio = NULL;
}
SrsGb28181RtmpMuxer::~SrsGb28181RtmpMuxer()
@ -988,7 +993,10 @@ SrsGb28181RtmpMuxer::~SrsGb28181RtmpMuxer()
srs_cond_destroy(wait_ps_queue);
srs_freep(jitter_buffer);
srs_freep(jitter_buffer_audio);
srs_freepa(ps_buffer);
srs_freepa(ps_buffer_audio);
srs_freep(channel);
srs_freep(ps_demixer);
srs_freep(trd);
@ -1094,6 +1102,14 @@ srs_error_t SrsGb28181RtmpMuxer::initialize(SrsServer *s, SrsRequest* r)
jitter_buffer->SetNackMode(kNack, -1, -1);
jitter_buffer->SetNackSettings(250, 450, 0);
if (!jitter_buffer_audio) {
jitter_buffer_audio = new SrsPsJitterBuffer(channel_id);
}
jitter_buffer_audio->SetDecodeErrorMode(kSelectiveErrors);
jitter_buffer_audio->SetNackMode(kNack, -1, -1);
jitter_buffer_audio->SetNackSettings(250, 450, 0);
if (!source_publish) return err;
req = r;
@ -1146,6 +1162,17 @@ srs_error_t SrsGb28181RtmpMuxer::do_cycle()
};
}
}
if(jitter_buffer_audio->FoundFrame(cur_timestamp)){
jitter_buffer_audio->GetPsFrame(&ps_buffer_audio, ps_buflen_auido, buffer_size, cur_timestamp);
if (buffer_size > 0){
if ((err = ps_demixer->on_ps_stream(ps_buffer_audio, buffer_size, cur_timestamp, 0)) != srs_success){
srs_warn("gb28181: demix ps stream error:%s", srs_error_desc(err).c_str());
srs_freep(err);
};
}
}
}else {
//demix ps to h264/aac, to rtmp
while(!ps_queue.empty()){
@ -1224,8 +1251,39 @@ void SrsGb28181RtmpMuxer::stop()
void SrsGb28181RtmpMuxer::insert_jitterbuffer(SrsPsRtpPacket *pkt)
{
if (!pkt){
return;
}
recv_rtp_stream_time = srs_get_system_time();
char *payload = pkt->payload->bytes();
uint8_t p1 = (uint8_t)(payload[0]);
uint8_t p2 = (uint8_t)(payload[1]);
uint8_t p3 = (uint8_t)(payload[2]);
uint8_t p4 = (uint8_t)(payload[3]);
//check for rtp ps audio streaming
bool av_same_ts = true;
if (p1 == 0x00 && p2 == 0x00 && p3 == 0x01 && p4 == 0xC0 &&
ps_rtp_video_ts != pkt->timestamp) {
av_same_ts = false;
}
//if audio and video are the same clock,
//if both audio and video use jitter_buffer,
//otherwise audio uses jitter_buffer_audio, and video uses jitter_buffer
if (av_same_ts){
pkt->marker = false;
jitter_buffer->InsertPacket(*pkt, pkt->payload->bytes(), pkt->payload->length(), NULL);
ps_rtp_video_ts = pkt->timestamp;
}else {
jitter_buffer_audio->InsertPacket(*pkt, pkt->payload->bytes(), pkt->payload->length(), NULL);
}
//srs_cond_signal(wait_ps_queue);
}

8
trunk/src/app/srs_app_gb28181.hpp
View file

@ -303,8 +303,16 @@ private:
SrsServer* server;
SrsPsJitterBuffer *jitter_buffer;
SrsPsJitterBuffer *jitter_buffer_audio;
char *ps_buffer;
char *ps_buffer_audio;
int ps_buflen;
int ps_buflen_auido;
uint32_t ps_rtp_video_ts;
uint32_t ps_rtp_audio_ts;
bool source_publish;

10
trunk/src/app/srs_app_gb28181_jitbuffer.cpp
View file

@ -306,11 +306,11 @@ PsFrameBufferEnum SrsPsFrameBuffer::InsertPacket(const VCMPacket& packet, const
}
//TODO: not check marker, check a complete frame with timestamp
// if (packet.markerBit &&
// (last_packet_seq_num_ == -1 ||
// IsNewerSequenceNumber(packet.seqNum, last_packet_seq_num_))) {
// last_packet_seq_num_ = packet.seqNum;
// }
if (packet.markerBit &&
(last_packet_seq_num_ == -1 ||
IsNewerSequenceNumber(packet.seqNum, last_packet_seq_num_))) {
last_packet_seq_num_ = packet.seqNum;
}
// The insert operation invalidates the iterator |rit|.
PacketIterator packet_list_it = packets_.insert(rit.base(), packet);