[{"id":4928,"web_url":"https://patchwork.libcamera.org/comment/4928/","msgid":"<50d212aa-1bd2-f678-828a-2abc9a7e4e37@ideasonboard.com>","date":"2020-05-28T10:03:11","subject":"Re: [libcamera-devel] [PATCH/RFC 06/11] gst: Replace explicit DRM\n\tFourCCs with libcamera formats","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 22/05/2020 15:54, Laurent Pinchart wrote:\n> Use the new pixel format constants to replace usage of macros from\n> drm_fourcc.h.\n> \n> Signed-off-by: Laurent Pinchart \n> ---\n> src/gstreamer/gstlibcamera-utils.cpp | 62 ++++++++++++++--------------\n> 1 file changed, 31 insertions(+), 31 deletions(-)\n> \n> diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp\n> index a3cb0746e012..61370d5fad56 100644\n> --- a/src/gstreamer/gstlibcamera-utils.cpp\n> +++ b/src/gstreamer/gstlibcamera-utils.cpp\n> @@ -8,56 +8,56 @@\n> \n> #include \"gstlibcamera-utils.h\"\n> \n> -#include \n> +#include \n\nWell, that's better isn't it ;-)\n\n> \n> using namespace libcamera;\n> \n> static struct {\n> \tGstVideoFormat gst_format;\n> -\tguint drm_fourcc;\n> +\tPixelFormat format;\n> } format_map[] = {\n> -\t{ GST_VIDEO_FORMAT_ENCODED, DRM_FORMAT_MJPEG },\n> -\t{ GST_VIDEO_FORMAT_RGB, DRM_FORMAT_BGR888 },\n> -\t{ GST_VIDEO_FORMAT_BGR, DRM_FORMAT_RGB888 },\n> -\t{ GST_VIDEO_FORMAT_ARGB, DRM_FORMAT_BGRA8888 },\n> -\t{ GST_VIDEO_FORMAT_NV12, DRM_FORMAT_NV12 },\n> -\t{ GST_VIDEO_FORMAT_NV21, DRM_FORMAT_NV21 },\n> -\t{ GST_VIDEO_FORMAT_NV16, DRM_FORMAT_NV16 },\n> -\t{ GST_VIDEO_FORMAT_NV61, DRM_FORMAT_NV61 },\n> -\t{ GST_VIDEO_FORMAT_NV24, DRM_FORMAT_NV24 },\n> -\t{ GST_VIDEO_FORMAT_UYVY, DRM_FORMAT_UYVY },\n> -\t{ GST_VIDEO_FORMAT_VYUY, DRM_FORMAT_VYUY },\n> -\t{ GST_VIDEO_FORMAT_YUY2, DRM_FORMAT_YUYV },\n> -\t{ GST_VIDEO_FORMAT_YVYU, DRM_FORMAT_YVYU },\n\n\n\n> +\t{ GST_VIDEO_FORMAT_ENCODED, formats::MJPEG },\n> +\t{ GST_VIDEO_FORMAT_RGB, formats::BGR888 },\n> +\t{ GST_VIDEO_FORMAT_BGR, formats::RGB888 },\n> +\t{ GST_VIDEO_FORMAT_ARGB, formats::BGRA8888 },\n\nI really hate that DRM formats are 'backwards' compared to 'all' other\nusers? Gst/V4L2/QT?\n\nWe 'could' make our defines the other way around, but then we're really\ndiverging from the DRM formats and probably adding in yet another level\nof confusion ;-(\n\n> +\t{ GST_VIDEO_FORMAT_NV12, formats::NV12 },\n> +\t{ GST_VIDEO_FORMAT_NV21, formats::NV21 },\n> +\t{ GST_VIDEO_FORMAT_NV16, formats::NV16 },\n> +\t{ GST_VIDEO_FORMAT_NV61, formats::NV61 },\n> +\t{ GST_VIDEO_FORMAT_NV24, formats::NV24 },\n> +\t{ GST_VIDEO_FORMAT_UYVY, formats::UYVY },\n> +\t{ GST_VIDEO_FORMAT_VYUY, formats::VYUY },\n> +\t{ GST_VIDEO_FORMAT_YUY2, formats::YUYV },\n> +\t{ GST_VIDEO_FORMAT_YVYU, formats::YVYU },\n\nHrm ... How come RGB formats are reversed but YUV formats are not?\n\nIs this correct?\n\n\nIf so ...\n\nReviewed-by: Kieran Bingham \n\n\n> \t/* \\todo NV42 is used in libcamera but is not mapped in GStreamer yet. */\n> };\n> \n> static GstVideoFormat\n> -drm_to_gst_format(guint drm_fourcc)\n> +pixel_format_to_gst_format(const PixelFormat &format)\n> {\n> \tfor (const auto &item : format_map) {\n> -\t\tif (item.drm_fourcc == drm_fourcc)\n> +\t\tif (item.format == format)\n> \t\t\treturn item.gst_format;\n> \t}\n> \treturn GST_VIDEO_FORMAT_UNKNOWN;\n> }\n> \n> -static guint\n> -gst_format_to_drm(GstVideoFormat gst_format)\n> +static PixelFormat\n> +gst_format_to_pixel_format(GstVideoFormat gst_format)\n> {\n> \tif (gst_format == GST_VIDEO_FORMAT_ENCODED)\n> -\t\treturn DRM_FORMAT_INVALID;\n> +\t\treturn PixelFormat{};\n> \n> \tfor (const auto &item : format_map)\n> \t\tif (item.gst_format == gst_format)\n> -\t\t\treturn item.drm_fourcc;\n> -\treturn DRM_FORMAT_INVALID;\n> +\t\t\treturn item.format;\n> +\treturn PixelFormat{};\n> }\n> \n> static GstStructure *\n> -bare_structure_from_fourcc(guint fourcc)\n> +bare_structure_from_format(const PixelFormat &format)\n> {\n> -\tGstVideoFormat gst_format = drm_to_gst_format(fourcc);\n> +\tGstVideoFormat gst_format = pixel_format_to_gst_format(format);\n> \n> \tif (gst_format == GST_VIDEO_FORMAT_UNKNOWN)\n> \t\treturn nullptr;\n> @@ -66,8 +66,8 @@ bare_structure_from_fourcc(guint fourcc)\n> \t\treturn gst_structure_new(\"video/x-raw\", \"format\", G_TYPE_STRING,\n> \t\t\t\t\t gst_video_format_to_string(gst_format), nullptr);\n> \n> -\tswitch (fourcc) {\n> -\tcase DRM_FORMAT_MJPEG:\n> +\tswitch (format) {\n> +\tcase formats::MJPEG:\n> \t\treturn gst_structure_new_empty(\"image/jpeg\");\n> \tdefault:\n> \t\treturn nullptr;\n> @@ -80,7 +80,7 @@ gst_libcamera_stream_formats_to_caps(const StreamFormats &formats)\n> \tGstCaps *caps = gst_caps_new_empty();\n> \n> \tfor (PixelFormat pixelformat : formats.pixelformats()) {\n> -\t\tg_autoptr(GstStructure) bare_s = bare_structure_from_fourcc(pixelformat);\n> +\t\tg_autoptr(GstStructure) bare_s = bare_structure_from_format(pixelformat);\n> \n> \t\tif (!bare_s) {\n> \t\t\tGST_WARNING(\"Unsupported DRM format %\" GST_FOURCC_FORMAT,\n> @@ -120,7 +120,7 @@ GstCaps *\n> gst_libcamera_stream_configuration_to_caps(const StreamConfiguration &stream_cfg)\n> {\n> \tGstCaps *caps = gst_caps_new_empty();\n> -\tGstStructure *s = bare_structure_from_fourcc(stream_cfg.pixelFormat);\n> +\tGstStructure *s = bare_structure_from_format(stream_cfg.pixelFormat);\n> \n> \tgst_structure_set(s,\n> \t\t\t \"width\", G_TYPE_INT, stream_cfg.size.width,\n> @@ -135,7 +135,7 @@ void\n> gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,\n> \t\t\t\t\t GstCaps *caps)\n> {\n> -\tGstVideoFormat gst_format = drm_to_gst_format(stream_cfg.pixelFormat);\n> +\tGstVideoFormat gst_format = pixel_format_to_gst_format(stream_cfg.pixelFormat);\n> \n> \t/* First fixate the caps using default configuration value. */\n> \tg_assert(gst_caps_is_writable(caps));\n> @@ -154,9 +154,9 @@ gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,\n> \tif (gst_structure_has_name(s, \"video/x-raw\")) {\n> \t\tconst gchar *format = gst_structure_get_string(s, \"format\");\n> \t\tgst_format = gst_video_format_from_string(format);\n> -\t\tstream_cfg.pixelFormat = PixelFormat(gst_format_to_drm(gst_format));\n> +\t\tstream_cfg.pixelFormat = gst_format_to_pixel_format(gst_format);\n> \t} else if (gst_structure_has_name(s, \"image/jpeg\")) {\n> -\t\tstream_cfg.pixelFormat = PixelFormat(DRM_FORMAT_MJPEG);\n> +\t\tstream_cfg.pixelFormat = formats::MJPEG;\n> \t} else {\n> \t\tg_critical(\"Unsupported media type: %s\", gst_structure_get_name(s));\n> \t}\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7005E603D3\n\tfor ;\n\tThu, 28 May 2020 12:03:15 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E752C2A3;\n\tThu, 28 May 2020 12:03:14 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"D5Qamz06\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1590660195;\n\tbh=FO+vXBBdFtDVTZAnEJCvdB2KuiMbVAsKADUUt9GmbOk=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=D5Qamz060lVCCpxmmXhUwRhWGVQ3q34JfxhqB78alYbaEO2jTJvywW6pwCJlOw5/P\n\tWGZoZqMu0v6VcGqTZVm2ewL2/74xqHup5+ANjbIs/5wHazophO/jR0xciD5eoN7rX8\n\tFNTPQCN90tze6o2Yp1pt1oC/IZirgFO91cmP6Ipc=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200522145459.16836-1-laurent.pinchart@ideasonboard.com>\n\t<20200522145459.16836-8-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<50d212aa-1bd2-f678-828a-2abc9a7e4e37@ideasonboard.com>","Date":"Thu, 28 May 2020 11:03:11 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.7.0","MIME-Version":"1.0","In-Reply-To":"<20200522145459.16836-8-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH/RFC 06/11] gst: Replace explicit DRM\n\tFourCCs with libcamera formats","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 28 May 2020 10:03:15 -0000"}},{"id":4934,"web_url":"https://patchwork.libcamera.org/comment/4934/","msgid":"<20200528111013.GA6009@pendragon.ideasonboard.com>","date":"2020-05-28T11:10:13","subject":"Re: [libcamera-devel] [PATCH/RFC 06/11] gst: Replace explicit DRM\n\tFourCCs with libcamera formats","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Thu, May 28, 2020 at 11:03:11AM +0100, Kieran Bingham wrote:\n> On 22/05/2020 15:54, Laurent Pinchart wrote:\n> > Use the new pixel format constants to replace usage of macros from\n> > drm_fourcc.h.\n> > \n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > src/gstreamer/gstlibcamera-utils.cpp | 62 ++++++++++++++--------------\n> > 1 file changed, 31 insertions(+), 31 deletions(-)\n> > \n> > diff --git a/src/gstreamer/gstlibcamera-utils.cpp b/src/gstreamer/gstlibcamera-utils.cpp\n> > index a3cb0746e012..61370d5fad56 100644\n> > --- a/src/gstreamer/gstlibcamera-utils.cpp\n> > +++ b/src/gstreamer/gstlibcamera-utils.cpp\n> > @@ -8,56 +8,56 @@\n> > \n> > #include \"gstlibcamera-utils.h\"\n> > \n> > -#include \n> > +#include \n> \n> Well, that's better isn't it ;-)\n> \n> > using namespace libcamera;\n> > \n> > static struct {\n> > \tGstVideoFormat gst_format;\n> > -\tguint drm_fourcc;\n> > +\tPixelFormat format;\n> > } format_map[] = {\n> > -\t{ GST_VIDEO_FORMAT_ENCODED, DRM_FORMAT_MJPEG },\n> > -\t{ GST_VIDEO_FORMAT_RGB, DRM_FORMAT_BGR888 },\n> > -\t{ GST_VIDEO_FORMAT_BGR, DRM_FORMAT_RGB888 },\n> > -\t{ GST_VIDEO_FORMAT_ARGB, DRM_FORMAT_BGRA8888 },\n> > -\t{ GST_VIDEO_FORMAT_NV12, DRM_FORMAT_NV12 },\n> > -\t{ GST_VIDEO_FORMAT_NV21, DRM_FORMAT_NV21 },\n> > -\t{ GST_VIDEO_FORMAT_NV16, DRM_FORMAT_NV16 },\n> > -\t{ GST_VIDEO_FORMAT_NV61, DRM_FORMAT_NV61 },\n> > -\t{ GST_VIDEO_FORMAT_NV24, DRM_FORMAT_NV24 },\n> > -\t{ GST_VIDEO_FORMAT_UYVY, DRM_FORMAT_UYVY },\n> > -\t{ GST_VIDEO_FORMAT_VYUY, DRM_FORMAT_VYUY },\n> > -\t{ GST_VIDEO_FORMAT_YUY2, DRM_FORMAT_YUYV },\n> > -\t{ GST_VIDEO_FORMAT_YVYU, DRM_FORMAT_YVYU },\n> \n> \n> \n> > +\t{ GST_VIDEO_FORMAT_ENCODED, formats::MJPEG },\n> > +\t{ GST_VIDEO_FORMAT_RGB, formats::BGR888 },\n> > +\t{ GST_VIDEO_FORMAT_BGR, formats::RGB888 },\n> > +\t{ GST_VIDEO_FORMAT_ARGB, formats::BGRA8888 },\n> \n> I really hate that DRM formats are 'backwards' compared to 'all' other\n> users? Gst/V4L2/QT?\n> \n> We 'could' make our defines the other way around, but then we're really\n> diverging from the DRM formats and probably adding in yet another level\n> of confusion ;-(\n> \n> > +\t{ GST_VIDEO_FORMAT_NV12, formats::NV12 },\n> > +\t{ GST_VIDEO_FORMAT_NV21, formats::NV21 },\n> > +\t{ GST_VIDEO_FORMAT_NV16, formats::NV16 },\n> > +\t{ GST_VIDEO_FORMAT_NV61, formats::NV61 },\n> > +\t{ GST_VIDEO_FORMAT_NV24, formats::NV24 },\n> > +\t{ GST_VIDEO_FORMAT_UYVY, formats::UYVY },\n> > +\t{ GST_VIDEO_FORMAT_VYUY, formats::VYUY },\n> > +\t{ GST_VIDEO_FORMAT_YUY2, formats::YUYV },\n> > +\t{ GST_VIDEO_FORMAT_YVYU, formats::YVYU },\n> \n> Hrm ... How come RGB formats are reversed but YUV formats are not?\n> \n> Is this correct?\n\nAs far as I can tell, but feel free to check :-)\n\n> If so ...\n> \n> Reviewed-by: Kieran Bingham \n> \n> > \t/* \\todo NV42 is used in libcamera but is not mapped in GStreamer yet. */\n> > };\n> > \n> > static GstVideoFormat\n> > -drm_to_gst_format(guint drm_fourcc)\n> > +pixel_format_to_gst_format(const PixelFormat &format)\n> > {\n> > \tfor (const auto &item : format_map) {\n> > -\t\tif (item.drm_fourcc == drm_fourcc)\n> > +\t\tif (item.format == format)\n> > \t\t\treturn item.gst_format;\n> > \t}\n> > \treturn GST_VIDEO_FORMAT_UNKNOWN;\n> > }\n> > \n> > -static guint\n> > -gst_format_to_drm(GstVideoFormat gst_format)\n> > +static PixelFormat\n> > +gst_format_to_pixel_format(GstVideoFormat gst_format)\n> > {\n> > \tif (gst_format == GST_VIDEO_FORMAT_ENCODED)\n> > -\t\treturn DRM_FORMAT_INVALID;\n> > +\t\treturn PixelFormat{};\n> > \n> > \tfor (const auto &item : format_map)\n> > \t\tif (item.gst_format == gst_format)\n> > -\t\t\treturn item.drm_fourcc;\n> > -\treturn DRM_FORMAT_INVALID;\n> > +\t\t\treturn item.format;\n> > +\treturn PixelFormat{};\n> > }\n> > \n> > static GstStructure *\n> > -bare_structure_from_fourcc(guint fourcc)\n> > +bare_structure_from_format(const PixelFormat &format)\n> > {\n> > -\tGstVideoFormat gst_format = drm_to_gst_format(fourcc);\n> > +\tGstVideoFormat gst_format = pixel_format_to_gst_format(format);\n> > \n> > \tif (gst_format == GST_VIDEO_FORMAT_UNKNOWN)\n> > \t\treturn nullptr;\n> > @@ -66,8 +66,8 @@ bare_structure_from_fourcc(guint fourcc)\n> > \t\treturn gst_structure_new(\"video/x-raw\", \"format\", G_TYPE_STRING,\n> > \t\t\t\t\t gst_video_format_to_string(gst_format), nullptr);\n> > \n> > -\tswitch (fourcc) {\n> > -\tcase DRM_FORMAT_MJPEG:\n> > +\tswitch (format) {\n> > +\tcase formats::MJPEG:\n> > \t\treturn gst_structure_new_empty(\"image/jpeg\");\n> > \tdefault:\n> > \t\treturn nullptr;\n> > @@ -80,7 +80,7 @@ gst_libcamera_stream_formats_to_caps(const StreamFormats &formats)\n> > \tGstCaps *caps = gst_caps_new_empty();\n> > \n> > \tfor (PixelFormat pixelformat : formats.pixelformats()) {\n> > -\t\tg_autoptr(GstStructure) bare_s = bare_structure_from_fourcc(pixelformat);\n> > +\t\tg_autoptr(GstStructure) bare_s = bare_structure_from_format(pixelformat);\n> > \n> > \t\tif (!bare_s) {\n> > \t\t\tGST_WARNING(\"Unsupported DRM format %\" GST_FOURCC_FORMAT,\n> > @@ -120,7 +120,7 @@ GstCaps *\n> > gst_libcamera_stream_configuration_to_caps(const StreamConfiguration &stream_cfg)\n> > {\n> > \tGstCaps *caps = gst_caps_new_empty();\n> > -\tGstStructure *s = bare_structure_from_fourcc(stream_cfg.pixelFormat);\n> > +\tGstStructure *s = bare_structure_from_format(stream_cfg.pixelFormat);\n> > \n> > \tgst_structure_set(s,\n> > \t\t\t \"width\", G_TYPE_INT, stream_cfg.size.width,\n> > @@ -135,7 +135,7 @@ void\n> > gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,\n> > \t\t\t\t\t GstCaps *caps)\n> > {\n> > -\tGstVideoFormat gst_format = drm_to_gst_format(stream_cfg.pixelFormat);\n> > +\tGstVideoFormat gst_format = pixel_format_to_gst_format(stream_cfg.pixelFormat);\n> > \n> > \t/* First fixate the caps using default configuration value. */\n> > \tg_assert(gst_caps_is_writable(caps));\n> > @@ -154,9 +154,9 @@ gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,\n> > \tif (gst_structure_has_name(s, \"video/x-raw\")) {\n> > \t\tconst gchar *format = gst_structure_get_string(s, \"format\");\n> > \t\tgst_format = gst_video_format_from_string(format);\n> > -\t\tstream_cfg.pixelFormat = PixelFormat(gst_format_to_drm(gst_format));\n> > +\t\tstream_cfg.pixelFormat = gst_format_to_pixel_format(gst_format);\n> > \t} else if (gst_structure_has_name(s, \"image/jpeg\")) {\n> > -\t\tstream_cfg.pixelFormat = PixelFormat(DRM_FORMAT_MJPEG);\n> > +\t\tstream_cfg.pixelFormat = formats::MJPEG;\n> > \t} else {\n> > \t\tg_critical(\"Unsupported media type: %s\", gst_structure_get_name(s));\n> > \t}","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3428A603D0\n\tfor ;\n\tThu, 28 May 2020 13:10:28 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 993282A8;\n\tThu, 28 May 2020 13:10:27 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"nFuiZmFT\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1590664227;\n\tbh=nVG7xOpsGhl6LAH0usnaK4uDUV9gv+KfHj79gmtr2oA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=nFuiZmFTxNMOP7km+qHAg8NwbgoaNXQwXISphAQYg9nF6KDpeQvIT8f6VCsBVQS+C\n\t8ch4h8vNVrj6AV7IhMor0CrEGMjaC/THv5FzbBEE+lC7bgDQUKqaIsh3KRZwkdOS1z\n\tIvTp1ATmTbQfnj/2ASXSFXm7L9QC2UwETav+yb5E=","Date":"Thu, 28 May 2020 14:10:13 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200528111013.GA6009@pendragon.ideasonboard.com>","References":"<20200522145459.16836-1-laurent.pinchart@ideasonboard.com>\n\t<20200522145459.16836-8-laurent.pinchart@ideasonboard.com>\n\t<50d212aa-1bd2-f678-828a-2abc9a7e4e37@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<50d212aa-1bd2-f678-828a-2abc9a7e4e37@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH/RFC 06/11] gst: Replace explicit DRM\n\tFourCCs with libcamera formats","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 28 May 2020 11:10:28 -0000"}}]