From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28FA51FA146; Tue, 28 Jan 2025 17:54:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738086883; cv=none; b=jLthKhFHl1LgJw6OXhlBMubMZl6X9Lh+L/VKlaD+W/qQgDR7miImbiKm3yRwgtGGtIqal9zWH0FglHJkqMnB0L5eWUK4xlfqJGF43AKEoH5SSjUMtZLlujYCqCIbeDo0Kr2MiY8/vRGCbsdq5sJuCmaJEPoFeUGYx+7JIC60FPc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738086883; c=relaxed/simple; bh=BPQw3lwgjMAkEpFWrODDv7zczTSB7zSkJ+Fq+GllJMU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Bu6LzdDXnLMKxa0zvp4yx1FTO4Po3OPIEd6rgehR76MmXLOezJLXe6qq4aieGOHU2U6oej7Tz9jbY6GVpmd4dXezlUc5S7OOJ2MRmSUzcgi+sNyNDGQGsxsDSRMhsC5coCEG4ruaT4wpYn4SFhqWQw+TLHhrGK9hIF1s40bdVv4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Iw78plrr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Iw78plrr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D42F0C4CED3; Tue, 28 Jan 2025 17:54:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738086883; bh=BPQw3lwgjMAkEpFWrODDv7zczTSB7zSkJ+Fq+GllJMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Iw78plrrfPP72ZIA3RuYjWaO2FcGsiqnQMssQfghP6Lr6faEM2GDobGWaRfT65f1y gVEdLlkvCg+QE4bUWfOF6/GOnplUSbLPysnHo6NRHWe+LQcvQPqILiRpl9x/Y9y32G CJ23GBNMItFjxAVJT3ZuugMaEXnmCKvy2EQC8dzzqeTHYxGwaPFIlP1lbd76hJbk3F W6AZ0VXzt9JUBkVBHQXEHvBhJ9J+CJmoQBoYHuv63HZWfa3vJlz5I7Ys6Px3anbFsf IFA9v8ABeWgHEVxazH7BG51KySBiqS5ducsG5XXunTRujQfOoXyw1oGcq2hX4jJL7h iX4rtiYK4g3vg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Isaac Scott , Ricardo Ribalda , Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin , hdegoede@redhat.com, mchehab@kernel.org, linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 04/11] media: uvcvideo: Implement dual stream quirk to fix loss of usb packets Date: Tue, 28 Jan 2025 12:54:28 -0500 Message-Id: <20250128175435.1197457-4-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250128175435.1197457-1-sashal@kernel.org> References: <20250128175435.1197457-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.74 Content-Transfer-Encoding: 8bit From: Isaac Scott [ Upstream commit c2eda35e675b6ea4a0a21a4b1167b121571a9036 ] Some cameras, such as the Sonix Technology Co. 292A, exhibit issues when running two parallel streams, causing USB packets to be dropped when an H.264 stream posts a keyframe while an MJPEG stream is running simultaneously. This occasionally causes the driver to erroneously output two consecutive JPEG images as a single frame. To fix this, we inspect the buffer, and trigger a new frame when we find an SOI. Signed-off-by: Isaac Scott Reviewed-by: Ricardo Ribalda Link: https://lore.kernel.org/r/20241128145144.61475-2-isaac.scott@ideasonboard.com Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/uvc/uvc_video.c | 27 ++++++++++++++++++++++++++- drivers/media/usb/uvc/uvcvideo.h | 1 + 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 91c350b254126..dff25cf230947 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -20,6 +20,7 @@ #include #include +#include #include #include "uvcvideo.h" @@ -1093,6 +1094,7 @@ static void uvc_video_stats_stop(struct uvc_streaming *stream) static int uvc_video_decode_start(struct uvc_streaming *stream, struct uvc_buffer *buf, const u8 *data, int len) { + u8 header_len; u8 fid; /* @@ -1106,6 +1108,7 @@ static int uvc_video_decode_start(struct uvc_streaming *stream, return -EINVAL; } + header_len = data[0]; fid = data[1] & UVC_STREAM_FID; /* @@ -1187,9 +1190,31 @@ static int uvc_video_decode_start(struct uvc_streaming *stream, return -EAGAIN; } + /* + * Some cameras, when running two parallel streams (one MJPEG alongside + * another non-MJPEG stream), are known to lose the EOF packet for a frame. + * We can detect the end of a frame by checking for a new SOI marker, as + * the SOI always lies on the packet boundary between two frames for + * these devices. + */ + if (stream->dev->quirks & UVC_QUIRK_MJPEG_NO_EOF && + (stream->cur_format->fcc == V4L2_PIX_FMT_MJPEG || + stream->cur_format->fcc == V4L2_PIX_FMT_JPEG)) { + const u8 *packet = data + header_len; + + if (len >= header_len + 2 && + packet[0] == 0xff && packet[1] == JPEG_MARKER_SOI && + buf->bytesused != 0) { + buf->state = UVC_BUF_STATE_READY; + buf->error = 1; + stream->last_fid ^= UVC_STREAM_FID; + return -EAGAIN; + } + } + stream->last_fid = fid; - return data[0]; + return header_len; } static inline enum dma_data_direction uvc_stream_dir( diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index e5b12717016fa..4f8d18efd007a 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -76,6 +76,7 @@ #define UVC_QUIRK_NO_RESET_RESUME 0x00004000 #define UVC_QUIRK_DISABLE_AUTOSUSPEND 0x00008000 #define UVC_QUIRK_INVALID_DEVICE_SOF 0x00010000 +#define UVC_QUIRK_MJPEG_NO_EOF 0x00020000 /* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001 -- 2.39.5