Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95ddf1f0 authored by Sriharsha Allenki's avatar Sriharsha Allenki
Browse files

usb: gadget: f_uvc: Fixed wrong length of H.264 frame descriptor 



Corrected the length of the H.264 frame descriptor and
used the correct functions to cast the frame descriptor
parameters.

Change-Id: I5895ebbf81a2a29d31962142c92836cc0a15ae4e
Signed-off-by: default avatarSriharsha Allenki <sallenki@codeaurora.org>
parent 2165bc1a

drivers/usb/gadget/function/f_uvc.h

+10 −11
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ static const struct uvc_format_h264 uvc_fmt_h264 = { 
};



DECLARE_UVC_FRAME_H264(1);

DECLARE_UVC_FRAME_H264(3);



static const struct UVC_FRAME_H264(1) uvc_frame_h264_1920p = {

	.bLength		= UVC_DT_FRAME_H264_SIZE(1),
@@ -260,15 +259,15 @@ static const struct UVC_FRAME_H264(1) uvc_frame_h264_1920p = { 
	.bmCapabilities		= 0x47,

	.bmSVCCapabilities	= 0x4,

	.bmMVCCapabilities	= 0,

	.dwMinBitRate		= cpu_to_le16(29491200),

	.dwMaxBitRate		= cpu_to_le16(100000000),

	.dwDefaultFrameInterval	= cpu_to_le16(333667),

	.dwMinBitRate		= cpu_to_le32(29491200),

	.dwMaxBitRate		= cpu_to_le32(100000000),

	.dwDefaultFrameInterval	= cpu_to_le32(333667),

	.bNumFrameIntervals	= 1,

	.dwFrameInterval[0]	= cpu_to_le16(333667),

	.dwFrameInterval[0]	= cpu_to_le32(333667),

};



static const struct UVC_FRAME_H264(3) uvc_frame_h264_960p = {

	.bLength		= UVC_DT_FRAME_H264_SIZE(3),

static const struct UVC_FRAME_H264(1) uvc_frame_h264_960p = {

	.bLength		= UVC_DT_FRAME_H264_SIZE(1),

	.bDescriptorType	= USB_DT_CS_INTERFACE,

	.bDescriptorSubType	= UVC_VS_FRAME_H264,

	.bFrameIndex		= 2,
@@ -283,11 +282,11 @@ static const struct UVC_FRAME_H264(3) uvc_frame_h264_960p = { 
	.bmCapabilities		= 0x47,

	.bmSVCCapabilities	= 0x4,

	.bmMVCCapabilities	= 0,

	.dwMinBitRate		= cpu_to_le16(29491200),

	.dwMaxBitRate		= cpu_to_le16(100000000),

	.dwDefaultFrameInterval	= cpu_to_le16(333667),

	.dwMinBitRate		= cpu_to_le32(29491200),

	.dwMaxBitRate		= cpu_to_le32(100000000),

	.dwDefaultFrameInterval	= cpu_to_le32(333667),

	.bNumFrameIntervals	= 1,

	.dwFrameInterval[0]	= cpu_to_le16(333667),

	.dwFrameInterval[0]	= cpu_to_le32(333667),

};



static const struct uvc_color_matching_descriptor uvc_color_matching = {