Merge pull request #38 from ua0lnj/master

Added drm device selection. /dev/dri/card1 and /dev/dri/card0 will be…

Author: ua0lnj

README

@@ -105,6 +105,9 @@ Command line arguments
   You can set X11 geometry with this parameter [W[xH]][+-x+-y][/WS] or x:y.
   Resolution of OSD get from settings of output plugin (softhd*). OSD is scaled to video size.
 
+-e drm device
+  force set drm device (ex. /dev/dri/card0). Otherwise they will be tried /dev/dri/card1 and /dev/dri/card0.
+
 Plugin setup options
 --------------------
 

config.c

@@ -45,6 +45,7 @@ cMpvPluginConfig::cMpvPluginConfig()
   Geometry = "";
   Windowed = 0;
   ShowOptions = 0;
+  DRMdev = "";
 }
 
 vector<string> cMpvPluginConfig::ExplodeString(string Input)
@@ -73,7 +74,7 @@ int cMpvPluginConfig::ProcessArgs(int argc, char *const argv[])
 
   for (;;)
   {
-    switch (getopt(argc, argv, "a:v:h:c:d:b:l:x:rm:swg:"))
+    switch (getopt(argc, argv, "a:v:h:c:d:b:l:x:rm:swg:e:"))
     {
       case 'a': // audio out
         AudioOut = optarg;
@@ -114,6 +115,9 @@ int cMpvPluginConfig::ProcessArgs(int argc, char *const argv[])
       case 'g':
         Geometry = optarg;
       continue;
+      case 'e':
+        DRMdev = optarg;
+      continue;
       case EOF:
       break;
       case ':':

config.h

@@ -60,6 +60,7 @@ class cMpvPluginConfig
     string X11Display;              // X11 display used for mpv
     string TitleOverride;           // title to display (ovveride used via service interface)
     string Geometry;                // X11 display geometry
+    string DRMdev;                  // DRM device
     int Windowed;                   // windowed mode, not fullscreen
 
     int ShowOptions;                // switch show menu options or filebrowser menu

mpv.c

@@ -19,7 +19,7 @@
 #include "menu_options.h"
 #include "mpv_service.h"
 
-static const char *VERSION = "1.6.1"
+static const char *VERSION = "1.7.0"
 #ifdef GIT_REV
     "-GIT" GIT_REV
 #endif

player.c

@@ -43,7 +43,7 @@ volatile int cMpvPlayer::running = 0;
 cMpvPlayer *cMpvPlayer::PlayerHandle = NULL;
 std::string LocaleSave;
 int drm_ctx = 0;
-
+const char *drm_dev = NULL;
 Display *Dpy = NULL;
 xcb_connection_t *Connect = NULL;
 xcb_window_t VideoWindow = 0;
@@ -453,6 +453,25 @@ void cMpvPlayer::PlayerHideCursor()
 }
 
 #ifdef USE_DRM
+int cMpvPlayer::PlayerTryDRM()
+{
+  int fd;
+  if (strcmp(MpvPluginConfig->DRMdev.c_str(),"")) {
+    drm_dev = MpvPluginConfig->DRMdev.c_str();
+    return 1;
+  }
+  //card1 mean external card, card0 internal. First try external card
+  fd = open("/dev/dri/card1", O_RDWR);
+  if (fd < 0) {
+    fd = open("/dev/dri/card0", O_RDWR);
+    if (fd < 0) return 0;
+    else drm_dev = "/dev/dri/card0";
+  } else drm_dev = "/dev/dri/card1";
+
+  close(fd);
+  return 1;
+}
+
 void cMpvPlayer::PlayerGetDRM()
 {
   int fd, i;
@@ -520,6 +539,8 @@ void cMpvPlayer::PlayerStart()
   if (!strcmp(MpvPluginConfig->GpuCtx.c_str(),"drm") || !strcmp(MpvPluginConfig->VideoOut.c_str(),"drm"))
   {
     drm_ctx = 1;
+    if (!PlayerTryDRM()) return;
+    check_error(mpv_set_option_string(hMpv, "drm-device", drm_dev));
   }
   //no geometry with drm
   if (!drm_ctx) {

player.h

@@ -26,6 +26,7 @@ class cMpvPlayer:public cPlayer
     void SwitchOsdToMpv();
     void PlayerHideCursor();
     void PlayerGetDRM();
+    int PlayerTryDRM();
 
     string PlayFilename;              // file to play
     bool PlayShuffle;                 // shuffle playlist