external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch '4.0release' into merge/develop

Browse source
This commit is contained in:
winlin 2021-04-01 14:47:48 +08:00
commit cc1cab2803
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_rtc_source.cpp
View file

@ -1965,7 +1965,9 @@ void SrsRtcVideoRecvTrack::on_before_decode_payload(SrsRtpPacket2* pkt, SrsBuffe
return; return;
} }
uint8_t v = (uint8_t)pkt->nalu_type; uint8_t v = (uint8_t)(buf->head()[0] & kNalTypeMask);
pkt->nalu_type = SrsAvcNaluType(v);
if (v == kStapA) { if (v == kStapA) {
*ppayload = new SrsRtpSTAPPayload(); *ppayload = new SrsRtpSTAPPayload();
*ppt = SrsRtpPacketPayloadTypeSTAP; *ppt = SrsRtpPacketPayloadTypeSTAP;

5
trunk/src/kernel/srs_kernel_rtc_rtp.cpp
View file

@ -1035,11 +1035,6 @@ srs_error_t SrsRtpPacket2::decode(SrsBuffer* buf)
} }
buf->set_size(buf->size() - padding); buf->set_size(buf->size() - padding);
// Try to parse the NALU type for video decoder.
if (!buf->empty()) {
nalu_type = SrsAvcNaluType((uint8_t)(buf->head()[0] & kNalTypeMask));
}
// TODO: FIXME: We should keep payload to NULL and return if buffer is empty. // TODO: FIXME: We should keep payload to NULL and return if buffer is empty.
// If user set the decode handler, call it to set the payload. // If user set the decode handler, call it to set the payload.
if (decode_handler) { if (decode_handler) {