From e3f37a3e36b92d2291ef94426c1c9315bdb5b59e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Mart=C3=ADnez?= Date: Tue, 28 Mar 2023 14:26:45 +0200 Subject: [PATCH] Support JPEG comment markers in MJPEG encoder (#219) * Skip JPEG comments * simplify code --------- Co-authored-by: Alessandro Ros --- pkg/codecs/jpeg/jpeg.go | 1 + pkg/formatdecenc/rtpmjpeg/encoder.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/codecs/jpeg/jpeg.go b/pkg/codecs/jpeg/jpeg.go index f21ccb03..db626674 100644 --- a/pkg/codecs/jpeg/jpeg.go +++ b/pkg/codecs/jpeg/jpeg.go @@ -10,4 +10,5 @@ const ( MarkerStartOfFrame1 = 0xC0 MarkerStartOfScan = 0xDA MarkerEndOfImage = 0xD9 + MarkerComment = 0xFE ) diff --git a/pkg/formatdecenc/rtpmjpeg/encoder.go b/pkg/formatdecenc/rtpmjpeg/encoder.go index cbc93fd3..066d8c43 100644 --- a/pkg/formatdecenc/rtpmjpeg/encoder.go +++ b/pkg/formatdecenc/rtpmjpeg/encoder.go @@ -95,7 +95,8 @@ outer: switch h1 { case 0xE0, 0xE1, 0xE2, // JFIF - jpeg.MarkerDefineHuffmanTable: + jpeg.MarkerDefineHuffmanTable, + jpeg.MarkerComment: mlen := int(image[0])<<8 | int(image[1]) if len(image) < mlen { return nil, fmt.Errorf("image is too short")