mirror of
https://github.com/pikvm/ustreamer.git
synced 2026-02-18 02:55:46 +00:00
janus: hotfix: reverted sps/pps logic for first/last packages
This commit is contained in:
parent
aa58b1b002
commit
0127dcf018
@ -106,6 +106,7 @@ void _rtpv_process_nalu(us_rtpv_s *rtpv, const u8 *data, uz size, u32 pts, bool
|
||||
u8 *dg = rtpv->rtp->datagram;
|
||||
|
||||
// Set *_of_frame flags only for non-SPS/PPS packages
|
||||
/*
|
||||
# define CALL_FOR_SERVICE { \
|
||||
const bool m_fof = rtpv->rtp->first_of_frame; \
|
||||
const bool m_lof = rtpv->rtp->last_of_frame; \
|
||||
@ -115,18 +116,19 @@ void _rtpv_process_nalu(us_rtpv_s *rtpv, const u8 *data, uz size, u32 pts, bool
|
||||
rtpv->rtp->first_of_frame = m_fof; \
|
||||
rtpv->rtp->last_of_frame = m_lof; \
|
||||
}
|
||||
*/
|
||||
|
||||
if (size + US_RTP_HEADER_SIZE <= US_RTP_TOTAL_SIZE) {
|
||||
us_rtp_write_header(rtpv->rtp, pts, marked);
|
||||
memcpy(dg + US_RTP_HEADER_SIZE, data, size);
|
||||
rtpv->rtp->used = size + US_RTP_HEADER_SIZE;
|
||||
if (type == 7 || type == 8) {
|
||||
CALL_FOR_SERVICE;
|
||||
} else {
|
||||
// if (type == 7 || type == 8) {
|
||||
// CALL_FOR_SERVICE;
|
||||
// } else {*/
|
||||
rtpv->rtp->last_of_frame = true;
|
||||
rtpv->callback(rtpv->rtp);
|
||||
rtpv->rtp->first_of_frame = false;
|
||||
}
|
||||
// }
|
||||
return;
|
||||
}
|
||||
|
||||
@ -158,13 +160,13 @@ void _rtpv_process_nalu(us_rtpv_s *rtpv, const u8 *data, uz size, u32 pts, bool
|
||||
|
||||
memcpy(dg + fu_overhead, src, frag_size);
|
||||
rtpv->rtp->used = fu_overhead + frag_size;
|
||||
if (type == 7 || type == 8) {
|
||||
CALL_FOR_SERVICE;
|
||||
} else {
|
||||
// if (type == 7 || type == 8) {
|
||||
// CALL_FOR_SERVICE;
|
||||
// } else {
|
||||
rtpv->rtp->last_of_frame = last;
|
||||
rtpv->callback(rtpv->rtp);
|
||||
rtpv->rtp->first_of_frame = false;
|
||||
}
|
||||
// }
|
||||
|
||||
src += frag_size;
|
||||
remaining -= frag_size;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user