Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2024-12-15 13:52:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix handling of 3 byte Annex B start sequences

Browse source
This commit is contained in:
Cameron Gutman 2022-09-05 17:56:42 -05:00
parent 07e902fe95
commit ad3ed97472
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/streaming/video/ffmpeg.cpp
View file

@ -957,7 +957,6 @@ bool FFmpegVideoDecoder::initialize(PDECODER_PARAMETERS params)
void FFmpegVideoDecoder::writeBuffer(PLENTRY entry, int& offset) void FFmpegVideoDecoder::writeBuffer(PLENTRY entry, int& offset)
{ {
if (m_NeedsSpsFixup && entry->bufferType == BUFFER_TYPE_SPS) { if (m_NeedsSpsFixup && entry->bufferType == BUFFER_TYPE_SPS) {
const char naluHeader[] = {0x00, 0x00, 0x00, 0x01};
h264_stream_t* stream = h264_new(); h264_stream_t* stream = h264_new();
int nalStart, nalEnd; int nalStart, nalEnd;
@ -967,7 +966,7 @@ void FFmpegVideoDecoder::writeBuffer(PLENTRY entry, int& offset)
(unsigned char *)&entry->data[nalStart], (unsigned char *)&entry->data[nalStart],
nalEnd - nalStart); nalEnd - nalStart);
SDL_assert(nalStart == sizeof(naluHeader)); SDL_assert(nalStart == 3 || nalStart == 4); // 3 or 4 byte Annex B start sequence
SDL_assert(nalEnd == entry->length); SDL_assert(nalEnd == entry->length);
// Fixup the SPS to what OS X needs to use hardware acceleration // Fixup the SPS to what OS X needs to use hardware acceleration
@ -976,15 +975,14 @@ void FFmpegVideoDecoder::writeBuffer(PLENTRY entry, int& offset)
int initialOffset = offset; int initialOffset = offset;
// Copy the modified NALU data. This assumes a 3 byte prefix and // Copy the modified NALU data. This clobbers byte 0 and starts NALU data at byte 1.
// begins writing from the 2nd byte, so we must write the data // Since it prepended one extra byte, subtract one from the returned length.
// first, then go back and write the Annex B prefix. offset += write_nal_unit(stream, (uint8_t*)&m_DecodeBuffer.data()[initialOffset + nalStart - 1],
offset += write_nal_unit(stream, (uint8_t*)&m_DecodeBuffer.data()[initialOffset + 3], MAX_SPS_EXTRA_SIZE + entry->length - nalStart) - 1;
MAX_SPS_EXTRA_SIZE + entry->length - sizeof(naluHeader));
// Copy the NALU prefix over from the original SPS // Copy the NALU prefix over from the original SPS
memcpy(&m_DecodeBuffer.data()[initialOffset], naluHeader, sizeof(naluHeader)); memcpy(&m_DecodeBuffer.data()[initialOffset], entry->data, nalStart);
offset += sizeof(naluHeader); offset += nalStart;
h264_free(stream); h264_free(stream);
} }

2
moonlight-common-c/moonlight-common-c

@ -1 +1 @@
Subproject commit ec420615a17785d4e625b9395907b6d28860c5cb Subproject commit e453a4d548559e216703a4f501ceede9b4952e12