KMSGrabContext *ctx = avctx->priv_data;
drmModeFB2 *fb;
int err, i, nb_objects;
+ uint64_t modifier = ctx->drm_format_modifier;
fb = drmModeGetFB2(ctx->hwctx->fd, plane->fb_id);
if (!fb) {
err = AVERROR(EIO);
goto fail;
}
- if (fb->modifier != ctx->drm_format_modifier) {
- av_log(avctx, AV_LOG_ERROR, "Plane %"PRIu32" framebuffer "
- "format modifier changed: now %"PRIx64".\n",
- ctx->plane_id, fb->modifier);
- err = AVERROR(EIO);
- goto fail;
- }
if (fb->width != ctx->width || fb->height != ctx->height) {
av_log(avctx, AV_LOG_ERROR, "Plane %"PRIu32" framebuffer "
"dimensions changed: now %"PRIu32"x%"PRIu32".\n",
goto fail;
}
+ if (fb->flags & DRM_MODE_FB_MODIFIERS)
+ modifier = fb->modifier;
+
*desc = (AVDRMFrameDescriptor) {
.nb_layers = 1,
.layers[0] = {
desc->objects[obj] = (AVDRMObjectDescriptor) {
.fd = fd,
.size = size,
- .format_modifier = fb->modifier,
+ .format_modifier = modifier,
};
desc->layers[0].planes[i] = (AVDRMPlaneDescriptor) {
.object_index = obj,
int64_t now;
int err;
- now = av_gettime();
+ now = av_gettime_relative();
if (ctx->frame_last) {
int64_t delay;
while (1) {
if (delay <= 0)
break;
av_usleep(delay);
- now = av_gettime();
+ now = av_gettime_relative();
}
}
ctx->frame_last = now;
+ now = av_gettime();
plane = drmModeGetPlane(ctx->hwctx->fd, ctx->plane_id);
if (!plane) {
enum AVPixelFormat pixfmt;
uint32_t drm_format;
} kmsgrab_formats[] = {
+ // Monochrome.
#ifdef DRM_FORMAT_R8
{ AV_PIX_FMT_GRAY8, DRM_FORMAT_R8 },
#endif
{ AV_PIX_FMT_GRAY16LE, DRM_FORMAT_R16 },
{ AV_PIX_FMT_GRAY16BE, DRM_FORMAT_R16 | DRM_FORMAT_BIG_ENDIAN },
#endif
+ // <8-bit RGB.
{ AV_PIX_FMT_BGR8, DRM_FORMAT_BGR233 },
{ AV_PIX_FMT_RGB555LE, DRM_FORMAT_XRGB1555 },
{ AV_PIX_FMT_RGB555BE, DRM_FORMAT_XRGB1555 | DRM_FORMAT_BIG_ENDIAN },
{ AV_PIX_FMT_RGB565BE, DRM_FORMAT_RGB565 | DRM_FORMAT_BIG_ENDIAN },
{ AV_PIX_FMT_BGR565LE, DRM_FORMAT_BGR565 },
{ AV_PIX_FMT_BGR565BE, DRM_FORMAT_BGR565 | DRM_FORMAT_BIG_ENDIAN },
+ // 8-bit RGB.
{ AV_PIX_FMT_RGB24, DRM_FORMAT_RGB888 },
{ AV_PIX_FMT_BGR24, DRM_FORMAT_BGR888 },
{ AV_PIX_FMT_0RGB, DRM_FORMAT_BGRX8888 },
{ AV_PIX_FMT_ABGR, DRM_FORMAT_RGBA8888 },
{ AV_PIX_FMT_RGBA, DRM_FORMAT_ABGR8888 },
{ AV_PIX_FMT_BGRA, DRM_FORMAT_ARGB8888 },
+ // 10-bit RGB.
+ { AV_PIX_FMT_X2RGB10LE, DRM_FORMAT_XRGB2101010 },
+ { AV_PIX_FMT_X2RGB10BE, DRM_FORMAT_XRGB2101010 | DRM_FORMAT_BIG_ENDIAN },
+ // 8-bit YUV 4:2:0.
+ { AV_PIX_FMT_NV12, DRM_FORMAT_NV12 },
+ // 8-bit YUV 4:2:2.
{ AV_PIX_FMT_YUYV422, DRM_FORMAT_YUYV },
{ AV_PIX_FMT_YVYU422, DRM_FORMAT_YVYU },
{ AV_PIX_FMT_UYVY422, DRM_FORMAT_UYVY },
AVStream *stream;
int err, i;
- for (i = 0; i < FF_ARRAY_ELEMS(kmsgrab_formats); i++) {
- if (kmsgrab_formats[i].pixfmt == ctx->format) {
- ctx->drm_format = kmsgrab_formats[i].drm_format;
- break;
- }
- }
- if (i >= FF_ARRAY_ELEMS(kmsgrab_formats)) {
- av_log(avctx, AV_LOG_ERROR, "Unsupported format %s.\n",
- av_get_pix_fmt_name(ctx->format));
- return AVERROR(EINVAL);
- }
-
err = av_hwdevice_ctx_create(&ctx->device_ref, AV_HWDEVICE_TYPE_DRM,
ctx->device_path, NULL, 0);
if (err < 0) {
err = AVERROR(EINVAL);
goto fail;
}
- if (ctx->drm_format != fb2->pixel_format) {
+
+ for (i = 0; i < FF_ARRAY_ELEMS(kmsgrab_formats); i++) {
+ if (kmsgrab_formats[i].drm_format == fb2->pixel_format) {
+ if (ctx->format != AV_PIX_FMT_NONE &&
+ ctx->format != kmsgrab_formats[i].pixfmt) {
+ av_log(avctx, AV_LOG_ERROR, "Framebuffer pixel format "
+ "%"PRIx32" does not match expected format.\n",
+ fb2->pixel_format);
+ err = AVERROR(EINVAL);
+ goto fail;
+ }
+ ctx->drm_format = fb2->pixel_format;
+ ctx->format = kmsgrab_formats[i].pixfmt;
+ break;
+ }
+ }
+ if (i == FF_ARRAY_ELEMS(kmsgrab_formats)) {
av_log(avctx, AV_LOG_ERROR, "Framebuffer pixel format "
- "%"PRIx32" does not match expected format.\n",
+ "%"PRIx32" is not a known supported format.\n",
fb2->pixel_format);
err = AVERROR(EINVAL);
goto fail;
}
- if (ctx->drm_format_modifier != DRM_FORMAT_MOD_INVALID &&
- ctx->drm_format_modifier != fb2->modifier) {
- av_log(avctx, AV_LOG_ERROR, "Framebuffer format modifier "
- "%"PRIx64" does not match expected modifier.\n",
- fb2->modifier);
- err = AVERROR(EINVAL);
- goto fail;
- } else {
- ctx->drm_format_modifier = fb2->modifier;
+
+ if (fb2->flags & DRM_MODE_FB_MODIFIERS) {
+ if (ctx->drm_format_modifier != DRM_FORMAT_MOD_INVALID &&
+ ctx->drm_format_modifier != fb2->modifier) {
+ av_log(avctx, AV_LOG_ERROR, "Framebuffer format modifier "
+ "%"PRIx64" does not match expected modifier.\n",
+ fb2->modifier);
+ err = AVERROR(EINVAL);
+ goto fail;
+ } else {
+ ctx->drm_format_modifier = fb2->modifier;
+ }
}
+ av_log(avctx, AV_LOG_VERBOSE, "Format is %s, from "
+ "DRM format %"PRIx32" modifier %"PRIx64".\n",
+ av_get_pix_fmt_name(ctx->format),
+ ctx->drm_format, ctx->drm_format_modifier);
+
ctx->fb2_available = 1;
}
#endif
if (!ctx->fb2_available) {
+ if (ctx->format == AV_PIX_FMT_NONE) {
+ // Backward compatibility: assume BGR0 if no format supplied.
+ ctx->format = AV_PIX_FMT_BGR0;
+ }
+ for (i = 0; i < FF_ARRAY_ELEMS(kmsgrab_formats); i++) {
+ if (kmsgrab_formats[i].pixfmt == ctx->format) {
+ ctx->drm_format = kmsgrab_formats[i].drm_format;
+ break;
+ }
+ }
+ if (i >= FF_ARRAY_ELEMS(kmsgrab_formats)) {
+ av_log(avctx, AV_LOG_ERROR, "Unsupported format %s.\n",
+ av_get_pix_fmt_name(ctx->format));
+ return AVERROR(EINVAL);
+ }
+
fb = drmModeGetFB(ctx->hwctx->fd, plane->fb_id);
if (!fb) {
err = errno;
{ .str = "/dev/dri/card0" }, 0, 0, FLAGS },
{ "format", "Pixel format for framebuffer",
OFFSET(format), AV_OPT_TYPE_PIXEL_FMT,
- { .i64 = AV_PIX_FMT_BGR0 }, 0, UINT32_MAX, FLAGS },
+ { .i64 = AV_PIX_FMT_NONE }, -1, INT32_MAX, FLAGS },
{ "format_modifier", "DRM format modifier for framebuffer",
OFFSET(drm_format_modifier), AV_OPT_TYPE_INT64,
{ .i64 = DRM_FORMAT_MOD_INVALID }, 0, INT64_MAX, FLAGS },
.category = AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT,
};
-AVInputFormat ff_kmsgrab_demuxer = {
+const AVInputFormat ff_kmsgrab_demuxer = {
.name = "kmsgrab",
.long_name = NULL_IF_CONFIG_SMALL("KMS screen capture"),
.priv_data_size = sizeof(KMSGrabContext),