package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-01 13:32:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support JPEG comment markers in MJPEG encoder (#219)

Browse Source 
* Skip JPEG comments

* simplify code

---------

Co-authored-by: Alessandro Ros <aler9.dev@gmail.com>
This commit is contained in:
Felipe Martínez
2023-03-28 14:26:45 +02:00
committed by GitHub
parent 281c1189e6
commit e3f37a3e36
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/codecs/jpeg/jpeg.go
View File

@@ -10,4 +10,5 @@ const (
MarkerStartOfFrame1 = 0xC0 MarkerStartOfFrame1 = 0xC0
MarkerStartOfScan = 0xDA MarkerStartOfScan = 0xDA
MarkerEndOfImage = 0xD9 MarkerEndOfImage = 0xD9
MarkerComment = 0xFE
) )

3
pkg/formatdecenc/rtpmjpeg/encoder.go
View File

@@ -95,7 +95,8 @@ outer:
switch h1 { switch h1 {
case 0xE0, 0xE1, 0xE2, // JFIF case 0xE0, 0xE1, 0xE2, // JFIF
jpeg.MarkerDefineHuffmanTable: jpeg.MarkerDefineHuffmanTable,
jpeg.MarkerComment:
mlen := int(image[0])<<8 | int(image[1]) mlen := int(image[0])<<8 | int(image[1])
if len(image) < mlen { if len(image) < mlen {
return nil, fmt.Errorf("image is too short") return nil, fmt.Errorf("image is too short")