virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

kmsgrab: Don't require the user to set framebuffer format

Browse Source 
This is provided by GetFB2, but we still need the option for cases where
that isn't available.
This commit is contained in:
Mark Thompson
2020-07-05 16:49:45 +01:00
parent ef934dba2d
commit ff14858a60
1 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
libavdevice/kmsgrab.c
View File

@@ -410,18 +410,6 @@ static av_cold int kmsgrab_read_header(AVFormatContext *avctx)
AVStream *stream; AVStream *stream;
int err, i; 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, err = av_hwdevice_ctx_create(&ctx->device_ref, AV_HWDEVICE_TYPE_DRM,
ctx->device_path, NULL, 0); ctx->device_path, NULL, 0);
if (err < 0) { if (err < 0) {
@@ -537,13 +525,29 @@ static av_cold int kmsgrab_read_header(AVFormatContext *avctx)
err = AVERROR(EINVAL); err = AVERROR(EINVAL);
goto fail; 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 " av_log(avctx, AV_LOG_ERROR, "Framebuffer pixel format "
"%"PRIx32" does not match expected format.\n", "%"PRIx32" does not match expected format.\n",
fb2->pixel_format); fb2->pixel_format);
err = AVERROR(EINVAL); err = AVERROR(EINVAL);
goto fail; 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" is not a known supported format.\n",
fb2->pixel_format);
err = AVERROR(EINVAL);
goto fail;
}
if (ctx->drm_format_modifier != DRM_FORMAT_MOD_INVALID && if (ctx->drm_format_modifier != DRM_FORMAT_MOD_INVALID &&
ctx->drm_format_modifier != fb2->modifier) { ctx->drm_format_modifier != fb2->modifier) {
av_log(avctx, AV_LOG_ERROR, "Framebuffer format modifier " av_log(avctx, AV_LOG_ERROR, "Framebuffer format modifier "
@@ -554,11 +558,32 @@ static av_cold int kmsgrab_read_header(AVFormatContext *avctx)
} else { } else {
ctx->drm_format_modifier = fb2->modifier; 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; ctx->fb2_available = 1;
} }
#endif #endif
if (!ctx->fb2_available) { 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); fb = drmModeGetFB(ctx->hwctx->fd, plane->fb_id);
if (!fb) { if (!fb) {
err = errno; err = errno;
@@ -649,7 +674,7 @@ static const AVOption options[] = {
{ .str = "/dev/dri/card0" }, 0, 0, FLAGS }, { .str = "/dev/dri/card0" }, 0, 0, FLAGS },
{ "format", "Pixel format for framebuffer", { "format", "Pixel format for framebuffer",
OFFSET(format), AV_OPT_TYPE_PIXEL_FMT, 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", { "format_modifier", "DRM format modifier for framebuffer",
OFFSET(drm_format_modifier), AV_OPT_TYPE_INT64, OFFSET(drm_format_modifier), AV_OPT_TYPE_INT64,
{ .i64 = DRM_FORMAT_MOD_INVALID }, 0, INT64_MAX, FLAGS }, { .i64 = DRM_FORMAT_MOD_INVALID }, 0, INT64_MAX, FLAGS },