moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2025-07-02 15:56:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid asserting on filler NALUs in reference frames on debug builds

Browse Source
This commit is contained in:
Cameron Gutman 2023-08-12 05:32:11 -05:00
parent 325518b47a
commit a0b29fe3dc
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/VideoDepacketizer.c
View File

@ -49,10 +49,12 @@ typedef struct _LENTRY_INTERNAL {
#define H264_NAL_TYPE_SPS 7 #define H264_NAL_TYPE_SPS 7
#define H264_NAL_TYPE_PPS 8 #define H264_NAL_TYPE_PPS 8
#define H264_NAL_TYPE_AUD 9 #define H264_NAL_TYPE_AUD 9
#define H264_NAL_TYPE_FILLER 12
#define HEVC_NAL_TYPE_VPS 32 #define HEVC_NAL_TYPE_VPS 32
#define HEVC_NAL_TYPE_SPS 33 #define HEVC_NAL_TYPE_SPS 33
#define HEVC_NAL_TYPE_PPS 34 #define HEVC_NAL_TYPE_PPS 34
#define HEVC_NAL_TYPE_AUD 35 #define HEVC_NAL_TYPE_AUD 35
#define HEVC_NAL_TYPE_FILLER 38
#define HEVC_NAL_TYPE_SEI 39 #define HEVC_NAL_TYPE_SEI 39
// Init // Init
@ -375,6 +377,25 @@ static bool isSeiNal(PBUFFER_DESC buffer) {
} }
} }
static bool isFillerDataNal(PBUFFER_DESC buffer) {
BUFFER_DESC startSeq;
if (!getAnnexBStartSequence(buffer, &startSeq)) {
return false;
}
if (NegotiatedVideoFormat & VIDEO_FORMAT_MASK_H264) {
return H264_NAL_TYPE(startSeq.data[startSeq.offset + startSeq.length]) == H264_NAL_TYPE_FILLER;
}
else if (NegotiatedVideoFormat & VIDEO_FORMAT_MASK_H265) {
return HEVC_NAL_TYPE(startSeq.data[startSeq.offset + startSeq.length]) == HEVC_NAL_TYPE_FILLER;
}
else {
LC_ASSERT(false);
return false;
}
}
static bool isPictureParameterSetNal(PBUFFER_DESC buffer) { static bool isPictureParameterSetNal(PBUFFER_DESC buffer) {
BUFFER_DESC startSeq; BUFFER_DESC startSeq;
@ -671,8 +692,9 @@ static void processAvcHevcRtpPayloadSlow(PBUFFER_DESC currentPos, PLENTRY_INTERN
// If this is the picture data, we expect it to extend to the end of the packet // If this is the picture data, we expect it to extend to the end of the packet
if (containsPicData) { if (containsPicData) {
while (currentPos->length != 0) { while (currentPos->length != 0) {
// Any NALUs we encounter on the way to the end of the packet must be reference frame slices // Any NALUs we encounter on the way to the end of the packet must be
LC_ASSERT(isSeqReferenceFrameStart(currentPos)); // reference frame slices or filler data.
LC_ASSERT(isSeqReferenceFrameStart(currentPos) || isFillerDataNal(currentPos));
skipToNextNalOrEnd(currentPos); skipToNextNalOrEnd(currentPos);
} }
} }