amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Added support for DRI frames in MJPEG RTP packetization (#3305)

Browse Source
This commit is contained in:
imp_rayjay 2024-02-19 11:54:13 +08:00 committed by GitHub
parent 4fb593f4a1
commit 87cb488b04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext-codec/JPEGRtp.cpp
View File

@ -605,6 +605,7 @@ void JPEGRtpEncoder::rtpSendJpeg(const uint8_t *buf, int size, uint64_t pts, uin
int i; int i;
int default_huffman_tables = 0; int default_huffman_tables = 0;
uint8_t *out = nullptr; uint8_t *out = nullptr;
uint16_t restart_interval = 0;
/* preparse the header for getting some info */ /* preparse the header for getting some info */
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
@ -714,6 +715,9 @@ void JPEGRtpEncoder::rtpSendJpeg(const uint8_t *buf, int size, uint64_t pts, uin
return; return;
} }
break; break;
} else if (buf[i + 1] == DRI) {
type |= 0x40;
restart_interval = AV_RB16(&buf[i + 4]);
} }
} }
if (default_huffman_tables && default_huffman_tables != 31) { if (default_huffman_tables && default_huffman_tables != 31) {
@ -744,6 +748,9 @@ void JPEGRtpEncoder::rtpSendJpeg(const uint8_t *buf, int size, uint64_t pts, uin
if (off == 0 && nb_qtables) if (off == 0 && nb_qtables)
hdr_size += 4 + 64 * nb_qtables; hdr_size += 4 + 64 * nb_qtables;
if (type & 0x40)
hdr_size += 4;
/* payload max in one packet */ /* payload max in one packet */
len = MIN(size, (int)getRtpInfo().getMaxSize() - hdr_size); len = MIN(size, (int)getRtpInfo().getMaxSize() - hdr_size);
@ -759,6 +766,13 @@ void JPEGRtpEncoder::rtpSendJpeg(const uint8_t *buf, int size, uint64_t pts, uin
bytestream_put_byte(&p, w); bytestream_put_byte(&p, w);
bytestream_put_byte(&p, h); bytestream_put_byte(&p, h);
/* set dri */
if (type & 0x40) {
bytestream_put_be16(&p, restart_interval);
bytestream_put_byte(&p, 0xff);
bytestream_put_byte(&p, 0xff);
}
if (off == 0 && nb_qtables) { if (off == 0 && nb_qtables) {
/* set quantization tables header */ /* set quantization tables header */
bytestream_put_byte(&p, 0); bytestream_put_byte(&p, 0);