History

hwcontext_vaapi: Try to create devices via DRM before X11

Opening the device via X11 (DRI2/DRI3) rather than opening a DRM render node directly is only useful if you intend to use the legacy X11 interop functions. That's never true for the ffmpeg utility, and a library user who does want this will likely provide their own display instance rather than making a new one here.

Mark Thompson committed 7 years ago

Commit 0b4696f1 parent 7f3f5a21 file · +21 −21Browse files

Unified · Split

libavutil/hwcontext_vaapi.c+21−21
@@ -1500,27 +1500,6 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, · 1499 unmodified lines
15001500 try_x11 = HAVE_VAAPI_X11;
15011501 }
15021502
1503−#if HAVE_VAAPI_X11
1504− if (!display && try_x11) {
1505− // Try to open the device as an X11 display.
1506− priv->x11_display = XOpenDisplay(device);
1507− if (!priv->x11_display) {
1508− av_log(ctx, AV_LOG_VERBOSE, "Cannot open X11 display "
1509− "%s.\n", XDisplayName(device));
1510− } else {
1511− display = vaGetDisplay(priv->x11_display);
1512− if (!display) {
1513− av_log(ctx, AV_LOG_ERROR, "Cannot open a VA display "
1514− "from X11 display %s.\n", XDisplayName(device));
1515− return AVERROR_UNKNOWN;
1516− }
1517−
1518− av_log(ctx, AV_LOG_VERBOSE, "Opened VA display via "
1519− "X11 display %s.\n", XDisplayName(device));
1520− }
1521− }
1522−#endif
1523−
15241503 #if HAVE_VAAPI_DRM
15251504 while (!display && try_drm) {
15261505 // If the device is specified, try to open it as a DRM device node.
@@ -1588,6 +1567,27 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, · 61 unmodified lines
15881567 }
15891568 #endif
15901569
1570+#if HAVE_VAAPI_X11
1571+ if (!display && try_x11) {
1572+ // Try to open the device as an X11 display.
1573+ priv->x11_display = XOpenDisplay(device);
1574+ if (!priv->x11_display) {
1575+ av_log(ctx, AV_LOG_VERBOSE, "Cannot open X11 display "
1576+ "%s.\n", XDisplayName(device));
1577+ } else {
1578+ display = vaGetDisplay(priv->x11_display);
1579+ if (!display) {
1580+ av_log(ctx, AV_LOG_ERROR, "Cannot open a VA display "
1581+ "from X11 display %s.\n", XDisplayName(device));
1582+ return AVERROR_UNKNOWN;
1583+ }
1584+
1585+ av_log(ctx, AV_LOG_VERBOSE, "Opened VA display via "
1586+ "X11 display %s.\n", XDisplayName(device));
1587+ }
1588+ }
1589+#endif
1590+
15911591 if (!display) {
15921592 if (device)
15931593 av_log(ctx, AV_LOG_ERROR, "No VA display found for "

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t