Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1288661pxj; Fri, 4 Jun 2021 10:26:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRF/mj7h8i+/0M4YLlnqCPuXW7y9FdBoV3vdWqO1eukvrwq9fGry9vgNsO5RfV4vMAAssF X-Received: by 2002:a05:6402:416:: with SMTP id q22mr5884130edv.204.1622827570720; Fri, 04 Jun 2021 10:26:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622827570; cv=none; d=google.com; s=arc-20160816; b=kJE714jNepfN2utMqPTxz9iaqCJ9fSOJzK2TfDs0g1tRuC6ujhs624D8ZpQg7CdQRj 5QIbUjc00BkIVgPYUGoldrMaqdyWTbfK3Lqs/WzWZiJRM6J6l0q/Zu14/GdzWZdqK2AQ VHSEe6JyH2fkBHyHoeV66mvccsqManMvI+fdRcEEjTi7kS7OMSqwiwk75FVAYpD4K0Ar 9pqRMZwo5ux1HckdgCFx9DpLHNDbtp0Kk6oTfhuAzsA3tQfduzdhOEwcBVM85DQuoj3p JKENlkdCDawgqtPhB6Q6ZvqPrIFojd98ysx1UCYn6aUf4MRvHGebqwhB6j3I0U325T6T wvBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=L+GBSoaIQVw6oCipb8X/Poc0d2y1wnswVFA8KX91Hyk=; b=eaYAqD09u3mxwbpUFfaozgDICQRB1OVYczPHg1W4RHrjXwCjF+NN3nco/LsDz7OtC+ kRhBkF6ls3BUCL0UQ5wKhDXhGgCaqZcnPlg4v/o5ENbL3b7SKX6GS8OGxzL7Lr9tCBQ5 sFj7xg6EqEA2n70R2NUaOJxOw3SZ1yzdrXUBrbBT1qgpjp43HSfKi9OT21eZ4+YF07ym B47JT4GBz/wViS4nObvL3z/ZsSKgO9ditQnwaprvX1SbucQXWtW/mNeIepwxZRE+cnUn wY/y41pxMsG6rPreqj8mmM+eJpNk3j1rzvJ3EEKRH5XjC0ga1yTpQnihBVxyOhJyJyvV fu8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@posteo.de header.s=2017 header.b=HPRy0hcs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=posteo.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k3si5669637edi.75.2021.06.04.10.25.47; Fri, 04 Jun 2021 10:26:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@posteo.de header.s=2017 header.b=HPRy0hcs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=posteo.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230262AbhFDRXm (ORCPT + 99 others); Fri, 4 Jun 2021 13:23:42 -0400 Received: from mout01.posteo.de ([185.67.36.65]:60301 "EHLO mout01.posteo.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229675AbhFDRXm (ORCPT ); Fri, 4 Jun 2021 13:23:42 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id DEF5D24002A for ; Fri, 4 Jun 2021 19:21:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1622827313; bh=WHtHWeqNoKkGAntx19d2vX4DoV1hTDSBtfCTG9oukn0=; h=From:To:Cc:Subject:Date:From; b=HPRy0hcsAobFr1027npAHGfw5zOJSghOrBf3N5WojvOSgi9YkKkxpcgOBsSOT1+9O oCXdH8zQ/rgqquDWbt489DuUA7KvAxF0G+GauztIs7w+nhwc3JVU8EFZYPkxy8bvAE bFw/+6gmAsqCpdlUwttJcpqORowTK+1TMZ4FAu/pQkj1ECbjgyqjDxVbX3Nk4aEW4n pVQp5etOgnnhQWSk2gYvxU+E7s8ZSGKl0qBod+gv3U58/i3DEfwcPi3ccxN0t18+dR gRgdgO4Bux3XQo7dScdlnQD9s03keOkdnrKhoDwX9qYt6wF7yPjOZkrwz1UViBqIbq LtxtHFOcX+4+Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FxV1X6fYvz9rxG; Fri, 4 Jun 2021 19:21:52 +0200 (CEST) From: Benjamin Drung To: Linus Torvalds , Adam Goode , Laurent Pinchart , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Benjamin Drung , stable@vger.kernel.org Subject: [PATCH v2] media: uvcvideo: Fix pixel format change for Elgato Cam Link 4K Date: Fri, 4 Jun 2021 17:19:42 +0000 Message-Id: <20210604171941.66136-1-bdrung@posteo.de> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Elgato Cam Link 4K HDMI video capture card reports to support three different pixel formats, where the first format depends on the connected HDMI device. ``` $ v4l2-ctl -d /dev/video0 --list-formats-ext ioctl: VIDIOC_ENUM_FMT Type: Video Capture [0]: 'NV12' (Y/CbCr 4:2:0) Size: Discrete 3840x2160 Interval: Discrete 0.033s (29.970 fps) [1]: 'NV12' (Y/CbCr 4:2:0) Size: Discrete 3840x2160 Interval: Discrete 0.033s (29.970 fps) [2]: 'YU12' (Planar YUV 4:2:0) Size: Discrete 3840x2160 Interval: Discrete 0.033s (29.970 fps) ``` Changing the pixel format to anything besides the first pixel format does not work: ``` $ v4l2-ctl -d /dev/video0 --try-fmt-video pixelformat=YU12 Format Video Capture: Width/Height : 3840/2160 Pixel Format : 'NV12' (Y/CbCr 4:2:0) Field : None Bytes per Line : 3840 Size Image : 12441600 Colorspace : sRGB Transfer Function : Rec. 709 YCbCr/HSV Encoding: Rec. 709 Quantization : Default (maps to Limited Range) Flags : ``` User space applications like VLC might show an error message on the terminal in that case: ``` libv4l2: error set_fmt gave us a different result than try_fmt! ``` Depending on the error handling of the user space applications, they might display a distorted video, because they use the wrong pixel format for decoding the stream. The Elgato Cam Link 4K responds to the USB video probe VS_PROBE_CONTROL/VS_COMMIT_CONTROL with a malformed data structure: The second byte contains bFormatIndex (instead of being the second byte of bmHint). The first byte is always zero. The third byte is always 1. The firmware bug was reported to Elgato on 2020-12-01 and it was forwarded by the support team to the developers as feature request. There is no firmware update available since then. The latest firmware for Elgato Cam Link 4K as of 2021-03-23 has MCU 20.02.19 and FPGA 67. Therefore add a quirk to correct the malformed data structure. The quirk was successfully tested with VLC, OBS, and Chromium using different pixel formats (YUYV, NV12, YU12), resolutions (3840x2160, 1920x1080), and frame rates (29.970 and 59.940 fps). Cc: stable@vger.kernel.org Signed-off-by: Benjamin Drung --- I am sending this patch a fourth time since I got no response and the last resend is over a month ago. This time I am including Linus Torvalds in the hope to get it reviewed. drivers/media/usb/uvc/uvc_driver.c | 13 +++++++++++++ drivers/media/usb/uvc/uvc_video.c | 21 +++++++++++++++++++++ drivers/media/usb/uvc/uvcvideo.h | 1 + 3 files changed, 35 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 9a791d8ef200..6ce58950d78b 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -3164,6 +3164,19 @@ static const struct usb_device_id uvc_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) }, + /* + * Elgato Cam Link 4K + * Latest firmware as of 2021-03-23 needs this quirk. + * MCU: 20.02.19, FPGA: 67 + */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor = 0x0fd9, + .idProduct = 0x0066, + .bInterfaceClass = USB_CLASS_VIDEO, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 0, + .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_FIX_FORMAT_INDEX) }, /* Generic USB Video Class */ { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) }, { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) }, diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index a777b389a66e..910d22233d74 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -131,6 +131,27 @@ static void uvc_fixup_video_ctrl(struct uvc_streaming *stream, struct uvc_frame *frame = NULL; unsigned int i; + /* + * The response of the Elgato Cam Link 4K is incorrect: The second byte + * contains bFormatIndex (instead of being the second byte of bmHint). + * The first byte is always zero. The third byte is always 1. + * + * The UVC 1.5 class specification defines the first five bits in the + * bmHint bitfield. The remaining bits are reserved and should be zero. + * Therefore a valid bmHint will be less than 32. + */ + if (stream->dev->quirks & UVC_QUIRK_FIX_FORMAT_INDEX && ctrl->bmHint > 255) { + __u8 corrected_format_index; + + corrected_format_index = ctrl->bmHint >> 8; + uvc_dbg(stream->dev, CONTROL, + "Correct USB video probe response from {bmHint: 0x%04x, bFormatIndex: 0x%02x} to {bmHint: 0x%04x, bFormatIndex: 0x%02x}.\n", + ctrl->bmHint, ctrl->bFormatIndex, + ctrl->bFormatIndex, corrected_format_index); + ctrl->bmHint = ctrl->bFormatIndex; + ctrl->bFormatIndex = corrected_format_index; + } + for (i = 0; i < stream->nformats; ++i) { if (stream->format[i].index == ctrl->bFormatIndex) { format = &stream->format[i]; diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index cce5e38133cd..cbb4ef61a64d 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -209,6 +209,7 @@ #define UVC_QUIRK_RESTORE_CTRLS_ON_INIT 0x00000400 #define UVC_QUIRK_FORCE_Y8 0x00000800 #define UVC_QUIRK_FORCE_BPP 0x00001000 +#define UVC_QUIRK_FIX_FORMAT_INDEX 0x00002000 /* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001 -- 2.27.0