NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

gst: Replace explicit DRM FourCCs with libcamera formats

Browse source 
Use the new pixel format constants to replace usage of macros from
drm_fourcc.h.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2020-05-22 04:02:06 +03:00
parent e8dc74317a
commit 2748265edc
1 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/gstreamer/gstlibcamera-utils.cpp
View file

@ -8,56 +8,56 @@
#include "gstlibcamera-utils.h" #include "gstlibcamera-utils.h"
#include <linux/drm_fourcc.h> #include <libcamera/formats.h>
using namespace libcamera; using namespace libcamera;
static struct { static struct {
GstVideoFormat gst_format; GstVideoFormat gst_format;
guint drm_fourcc; PixelFormat format;
} format_map[] = { } format_map[] = {
{ GST_VIDEO_FORMAT_ENCODED, DRM_FORMAT_MJPEG }, { GST_VIDEO_FORMAT_ENCODED, formats::MJPEG },
{ GST_VIDEO_FORMAT_RGB, DRM_FORMAT_BGR888 }, { GST_VIDEO_FORMAT_RGB, formats::BGR888 },
{ GST_VIDEO_FORMAT_BGR, DRM_FORMAT_RGB888 }, { GST_VIDEO_FORMAT_BGR, formats::RGB888 },
{ GST_VIDEO_FORMAT_ARGB, DRM_FORMAT_BGRA8888 }, { GST_VIDEO_FORMAT_ARGB, formats::BGRA8888 },
{ GST_VIDEO_FORMAT_NV12, DRM_FORMAT_NV12 }, { GST_VIDEO_FORMAT_NV12, formats::NV12 },
{ GST_VIDEO_FORMAT_NV21, DRM_FORMAT_NV21 }, { GST_VIDEO_FORMAT_NV21, formats::NV21 },
{ GST_VIDEO_FORMAT_NV16, DRM_FORMAT_NV16 }, { GST_VIDEO_FORMAT_NV16, formats::NV16 },
{ GST_VIDEO_FORMAT_NV61, DRM_FORMAT_NV61 }, { GST_VIDEO_FORMAT_NV61, formats::NV61 },
{ GST_VIDEO_FORMAT_NV24, DRM_FORMAT_NV24 }, { GST_VIDEO_FORMAT_NV24, formats::NV24 },
{ GST_VIDEO_FORMAT_UYVY, DRM_FORMAT_UYVY }, { GST_VIDEO_FORMAT_UYVY, formats::UYVY },
{ GST_VIDEO_FORMAT_VYUY, DRM_FORMAT_VYUY }, { GST_VIDEO_FORMAT_VYUY, formats::VYUY },
{ GST_VIDEO_FORMAT_YUY2, DRM_FORMAT_YUYV }, { GST_VIDEO_FORMAT_YUY2, formats::YUYV },
{ GST_VIDEO_FORMAT_YVYU, DRM_FORMAT_YVYU }, { GST_VIDEO_FORMAT_YVYU, formats::YVYU },
/* \todo NV42 is used in libcamera but is not mapped in GStreamer yet. */ /* \todo NV42 is used in libcamera but is not mapped in GStreamer yet. */
}; };
static GstVideoFormat static GstVideoFormat
drm_to_gst_format(guint drm_fourcc) pixel_format_to_gst_format(const PixelFormat &format)
{ {
for (const auto &item : format_map) { for (const auto &item : format_map) {
if (item.drm_fourcc == drm_fourcc) if (item.format == format)
return item.gst_format; return item.gst_format;
} }
return GST_VIDEO_FORMAT_UNKNOWN; return GST_VIDEO_FORMAT_UNKNOWN;
} }
static guint static PixelFormat
gst_format_to_drm(GstVideoFormat gst_format) gst_format_to_pixel_format(GstVideoFormat gst_format)
{ {
if (gst_format == GST_VIDEO_FORMAT_ENCODED) if (gst_format == GST_VIDEO_FORMAT_ENCODED)
return DRM_FORMAT_INVALID; return PixelFormat{};
for (const auto &item : format_map) for (const auto &item : format_map)
if (item.gst_format == gst_format) if (item.gst_format == gst_format)
return item.drm_fourcc; return item.format;
return DRM_FORMAT_INVALID; return PixelFormat{};
} }
static GstStructure * static GstStructure *
bare_structure_from_fourcc(guint fourcc) bare_structure_from_format(const PixelFormat &format)
{ {
GstVideoFormat gst_format = drm_to_gst_format(fourcc); GstVideoFormat gst_format = pixel_format_to_gst_format(format);
if (gst_format == GST_VIDEO_FORMAT_UNKNOWN) if (gst_format == GST_VIDEO_FORMAT_UNKNOWN)
return nullptr; return nullptr;
@ -66,8 +66,8 @@ bare_structure_from_fourcc(guint fourcc)
return gst_structure_new("video/x-raw", "format", G_TYPE_STRING, return gst_structure_new("video/x-raw", "format", G_TYPE_STRING,
gst_video_format_to_string(gst_format), nullptr); gst_video_format_to_string(gst_format), nullptr);
switch (fourcc) { switch (format) {
case DRM_FORMAT_MJPEG: case formats::MJPEG:
return gst_structure_new_empty("image/jpeg"); return gst_structure_new_empty("image/jpeg");
default: default:
return nullptr; return nullptr;
@ -80,7 +80,7 @@ gst_libcamera_stream_formats_to_caps(const StreamFormats &formats)
GstCaps *caps = gst_caps_new_empty(); GstCaps *caps = gst_caps_new_empty();
for (PixelFormat pixelformat : formats.pixelformats()) { for (PixelFormat pixelformat : formats.pixelformats()) {
g_autoptr(GstStructure) bare_s = bare_structure_from_fourcc(pixelformat); g_autoptr(GstStructure) bare_s = bare_structure_from_format(pixelformat);
if (!bare_s) { if (!bare_s) {
GST_WARNING("Unsupported DRM format %" GST_FOURCC_FORMAT, GST_WARNING("Unsupported DRM format %" GST_FOURCC_FORMAT,
@ -120,7 +120,7 @@ GstCaps *
gst_libcamera_stream_configuration_to_caps(const StreamConfiguration &stream_cfg) gst_libcamera_stream_configuration_to_caps(const StreamConfiguration &stream_cfg)
{ {
GstCaps *caps = gst_caps_new_empty(); GstCaps *caps = gst_caps_new_empty();
GstStructure *s = bare_structure_from_fourcc(stream_cfg.pixelFormat); GstStructure *s = bare_structure_from_format(stream_cfg.pixelFormat);
gst_structure_set(s, gst_structure_set(s,
"width", G_TYPE_INT, stream_cfg.size.width, "width", G_TYPE_INT, stream_cfg.size.width,
@ -135,7 +135,7 @@ void
gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg, gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,
GstCaps *caps) GstCaps *caps)
{ {
GstVideoFormat gst_format = drm_to_gst_format(stream_cfg.pixelFormat); GstVideoFormat gst_format = pixel_format_to_gst_format(stream_cfg.pixelFormat);
/* First fixate the caps using default configuration value. */ /* First fixate the caps using default configuration value. */
g_assert(gst_caps_is_writable(caps)); g_assert(gst_caps_is_writable(caps));
@ -154,9 +154,9 @@ gst_libcamera_configure_stream_from_caps(StreamConfiguration &stream_cfg,
if (gst_structure_has_name(s, "video/x-raw")) { if (gst_structure_has_name(s, "video/x-raw")) {
const gchar *format = gst_structure_get_string(s, "format"); const gchar *format = gst_structure_get_string(s, "format");
gst_format = gst_video_format_from_string(format); gst_format = gst_video_format_from_string(format);
stream_cfg.pixelFormat = PixelFormat(gst_format_to_drm(gst_format)); stream_cfg.pixelFormat = gst_format_to_pixel_format(gst_format);
} else if (gst_structure_has_name(s, "image/jpeg")) { } else if (gst_structure_has_name(s, "image/jpeg")) {
stream_cfg.pixelFormat = PixelFormat(DRM_FORMAT_MJPEG); stream_cfg.pixelFormat = formats::MJPEG;
} else { } else {
g_critical("Unsupported media type: %s", gst_structure_get_name(s)); g_critical("Unsupported media type: %s", gst_structure_get_name(s));
} }