On 6/26/19 6:31 PM, Laurent Pinchart wrote: > Hi Hans, > > Thank you for the patch. > > On Wed, Jun 26, 2019 at 01:27:44PM +0200, Hans Verkuil wrote: >> The v4l_fill_fmtdesc() is supposed to be updated whenever a new pixelformat >> is added, but a bunch of recently added pixelformats were forgotten. > > Sorry about forgetting tp update the code :-( > >> Update the list. >> >> Also change a few lower case words to upper case to keep the same style. >> >> Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx> >> Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> >> --- >> drivers/media/v4l2-core/v4l2-ioctl.c | 29 ++++++++++++++++++++++------ >> 1 file changed, 23 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c >> index b1f4b991dba6..c1faa7ca1925 100644 >> --- a/drivers/media/v4l2-core/v4l2-ioctl.c >> +++ b/drivers/media/v4l2-core/v4l2-ioctl.c >> @@ -1169,9 +1169,21 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) >> case V4L2_PIX_FMT_RGB444: descr = "16-bit A/XRGB 4-4-4-4"; break; >> case V4L2_PIX_FMT_ARGB444: descr = "16-bit ARGB 4-4-4-4"; break; >> case V4L2_PIX_FMT_XRGB444: descr = "16-bit XRGB 4-4-4-4"; break; >> + case V4L2_PIX_FMT_RGBA444: descr = "16-bit RGBA 4-4-4-4"; break; >> + case V4L2_PIX_FMT_RGBX444: descr = "16-bit RGBX 4-4-4-4"; break; >> + case V4L2_PIX_FMT_ABGR444: descr = "16-bit ABGR 4-4-4-4"; break; >> + case V4L2_PIX_FMT_XBGR444: descr = "16-bit XBGR 4-4-4-4"; break; >> + case V4L2_PIX_FMT_BGRA444: descr = "16-bit BGRA 4-4-4-4"; break; >> + case V4L2_PIX_FMT_BGRX444: descr = "16-bit BGRX 4-4-4-4"; break; >> case V4L2_PIX_FMT_RGB555: descr = "16-bit A/XRGB 1-5-5-5"; break; >> case V4L2_PIX_FMT_ARGB555: descr = "16-bit ARGB 1-5-5-5"; break; >> case V4L2_PIX_FMT_XRGB555: descr = "16-bit XRGB 1-5-5-5"; break; >> + case V4L2_PIX_FMT_ABGR555: descr = "16-bit ABGR 1-5-5-5"; break; >> + case V4L2_PIX_FMT_XBGR555: descr = "16-bit XBGR 1-5-5-5"; break; >> + case V4L2_PIX_FMT_RGBA555: descr = "16-bit RGBA 1-5-5-5"; break; >> + case V4L2_PIX_FMT_RGBX555: descr = "16-bit RGBX 1-5-5-5"; break; >> + case V4L2_PIX_FMT_BGRA555: descr = "16-bit BGRA 1-5-5-5"; break; >> + case V4L2_PIX_FMT_BGRX555: descr = "16-bit BGRX 1-5-5-5"; break; > > Should the last four formats be described as 5-5-5-1 to match the order > of the components ? Good point. I'll take another look at that. Regards, Hans > > With or without this changed, > > Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > >> case V4L2_PIX_FMT_RGB565: descr = "16-bit RGB 5-6-5"; break; >> case V4L2_PIX_FMT_RGB555X: descr = "16-bit A/XRGB 1-5-5-5 BE"; break; >> case V4L2_PIX_FMT_ARGB555X: descr = "16-bit ARGB 1-5-5-5 BE"; break; >> @@ -1186,6 +1198,10 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) >> case V4L2_PIX_FMT_RGB32: descr = "32-bit A/XRGB 8-8-8-8"; break; >> case V4L2_PIX_FMT_ARGB32: descr = "32-bit ARGB 8-8-8-8"; break; >> case V4L2_PIX_FMT_XRGB32: descr = "32-bit XRGB 8-8-8-8"; break; >> + case V4L2_PIX_FMT_BGRA32: descr = "32-bit ABGR 8-8-8-8"; break; >> + case V4L2_PIX_FMT_BGRX32: descr = "32-bit XBGR 8-8-8-8"; break; >> + case V4L2_PIX_FMT_RGBA32: descr = "32-bit RGBA 8-8-8-8"; break; >> + case V4L2_PIX_FMT_RGBX32: descr = "32-bit RGBX 8-8-8-8"; break; >> case V4L2_PIX_FMT_GREY: descr = "8-bit Greyscale"; break; >> case V4L2_PIX_FMT_Y4: descr = "4-bit Greyscale"; break; >> case V4L2_PIX_FMT_Y6: descr = "6-bit Greyscale"; break; >> @@ -1301,13 +1317,14 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) >> case V4L2_SDR_FMT_PCU16BE: descr = "Planar Complex U16BE"; break; >> case V4L2_SDR_FMT_PCU18BE: descr = "Planar Complex U18BE"; break; >> case V4L2_SDR_FMT_PCU20BE: descr = "Planar Complex U20BE"; break; >> - case V4L2_TCH_FMT_DELTA_TD16: descr = "16-bit signed deltas"; break; >> - case V4L2_TCH_FMT_DELTA_TD08: descr = "8-bit signed deltas"; break; >> - case V4L2_TCH_FMT_TU16: descr = "16-bit unsigned touch data"; break; >> - case V4L2_TCH_FMT_TU08: descr = "8-bit unsigned touch data"; break; >> + case V4L2_TCH_FMT_DELTA_TD16: descr = "16-bit Signed Deltas"; break; >> + case V4L2_TCH_FMT_DELTA_TD08: descr = "8-bit Signed Deltas"; break; >> + case V4L2_TCH_FMT_TU16: descr = "16-bit Unsigned Touch Data"; break; >> + case V4L2_TCH_FMT_TU08: descr = "8-bit Unsigned Touch Data"; break; >> case V4L2_META_FMT_VSP1_HGO: descr = "R-Car VSP1 1-D Histogram"; break; >> case V4L2_META_FMT_VSP1_HGT: descr = "R-Car VSP1 2-D Histogram"; break; >> - case V4L2_META_FMT_UVC: descr = "UVC payload header metadata"; break; >> + case V4L2_META_FMT_UVC: descr = "UVC Payload Header Metadata"; break; >> + case V4L2_META_FMT_D4XX: descr = "Intel D4xx UVC Metadata"; break; >> >> default: >> /* Compressed formats */ >> @@ -1326,7 +1343,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) >> case V4L2_PIX_FMT_MPEG1: descr = "MPEG-1 ES"; break; >> case V4L2_PIX_FMT_MPEG2: descr = "MPEG-2 ES"; break; >> case V4L2_PIX_FMT_MPEG2_SLICE: descr = "MPEG-2 Parsed Slice Data"; break; >> - case V4L2_PIX_FMT_MPEG4: descr = "MPEG-4 part 2 ES"; break; >> + case V4L2_PIX_FMT_MPEG4: descr = "MPEG-4 Part 2 ES"; break; >> case V4L2_PIX_FMT_XVID: descr = "Xvid"; break; >> case V4L2_PIX_FMT_VC1_ANNEX_G: descr = "VC-1 (SMPTE 412M Annex G)"; break; >> case V4L2_PIX_FMT_VC1_ANNEX_L: descr = "VC-1 (SMPTE 412M Annex L)"; break; >
