github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

drm_prime: forward modifiers from FFMPEG to drm API 

* Change drmModeAddFB2 to drmModeAddFB2WithModifiers
* Set modifiers flag in API call
* fetch and set modifiers according to kernel constraints
This commit is contained in:
Sven Kroeger 2020-03-02 16:22:10 +01:00 committed by Anton Kindestam
parent 24acddbdc4
commit 8b24510388
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
video/out/drm_prime.c
View File

@ -18,6 +18,7 @@
#include <unistd.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
#include <drm_mode.h>
#include "common/msg.h"
#include "drm_common.h"
@ -28,6 +29,7 @@ int drm_prime_create_framebuffer(struct mp_log *log, int fd, AVDRMFrameDescripto
{
AVDRMLayerDescriptor *layer = NULL;
uint32_t pitches[4], offsets[4], handles[4];
uint64_t modifiers[4];
int ret, layer_fd;
if (descriptor && descriptor->nb_layers) {
@ -39,6 +41,9 @@ int drm_prime_create_framebuffer(struct mp_log *log, int fd, AVDRMFrameDescripto
mp_err(log, "Failed to retrieve the Prime Handle from handle %d (%d).\n", object, descriptor->objects[object].fd);
goto fail;
}
if(object == 0) {
modifiers[object] = descriptor->objects[object].format_modifier;
}
}
layer = &descriptor->layers[0];
@ -49,15 +54,17 @@ int drm_prime_create_framebuffer(struct mp_log *log, int fd, AVDRMFrameDescripto
pitches[plane] = layer->planes[plane].pitch;
offsets[plane] = layer->planes[plane].offset;
handles[plane] = layer_fd;
modifiers[plane] = modifiers[0];
} else {
pitches[plane] = 0;
offsets[plane] = 0;
handles[plane] = 0;
modifiers[plane] = 0;
}
}
ret = drmModeAddFB2(fd, width, height, layer->format,
handles, pitches, offsets, &framebuffer->fb_id, 0);
ret = drmModeAddFB2WithModifiers(fd, width, height, layer->format,
handles, pitches, offsets, modifiers, &framebuffer->fb_id, DRM_MODE_FB_MODIFIERS);
if (ret < 0) {
mp_err(log, "Failed to create framebuffer on layer %d.\n", 0);
goto fail;