From 831e09de92ead10ad3c064d3aed48c7bc18d64f9 Mon Sep 17 00:00:00 2001 From: Aaron Date: Fri, 8 Nov 2019 22:42:03 +0100 Subject: [PATCH] add support for mjpg --- examples/http_mjpeg_streamer/webcam.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/examples/http_mjpeg_streamer/webcam.go b/examples/http_mjpeg_streamer/webcam.go index adfa08c..d26bad2 100644 --- a/examples/http_mjpeg_streamer/webcam.go +++ b/examples/http_mjpeg_streamer/webcam.go @@ -22,6 +22,7 @@ import ( const ( V4L2_PIX_FMT_PJPG = 0x47504A50 + V4L2_PIX_FMT_MJPG = 0x47504a4d V4L2_PIX_FMT_YUYV = 0x56595559 ) @@ -45,6 +46,7 @@ func (slice FrameSizes) Swap(i, j int) { var supportedFormats = map[webcam.PixelFormat]bool{ V4L2_PIX_FMT_PJPG: true, + V4L2_PIX_FMT_MJPG: true, V4L2_PIX_FMT_YUYV: true, } @@ -219,6 +221,9 @@ func encodeToImage(wc *webcam.Webcam, back chan struct{}, fi chan []byte, li cha } img = yuyv + case V4L2_PIX_FMT_MJPG: + mjpg, _, _ := image.Decode(bytes.NewReader(frame)) + img = mjpg default: log.Fatal("invalid format ?") }