|
|
|
@ -1053,11 +1053,7 @@ srs_error_t SrsGb28181RtmpMuxer::do_cycle()
|
|
|
|
|
rtmp_close();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ps_queue.empty()){
|
|
|
|
|
srs_cond_timedwait(wait_ps_queue, 20 * SRS_UTIME_MILLISECONDS);
|
|
|
|
|
}else {
|
|
|
|
|
srs_cond_timedwait(wait_ps_queue, 10 * SRS_UTIME_MILLISECONDS);
|
|
|
|
|
}
|
|
|
|
|
srs_cond_timedwait(wait_ps_queue, 10 * SRS_UTIME_MILLISECONDS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
@ -1078,6 +1074,7 @@ void SrsGb28181RtmpMuxer::insert_jitterbuffer(SrsPsRtpPacket *pkt)
|
|
|
|
|
{
|
|
|
|
|
recv_rtp_stream_time = srs_get_system_time();
|
|
|
|
|
jitter_buffer->InsertPacket(*pkt, pkt->payload->bytes(), pkt->payload->length(), NULL);
|
|
|
|
|
srs_cond_signal(wait_ps_queue);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void SrsGb28181RtmpMuxer::ps_packet_enqueue(SrsPsRtpPacket *pkt)
|
|
|
|
|