Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Added RGB565 support. #1

Merged
merged 4 commits into from over 1 year ago

2 participants

Juan Pablo Garrett Brown
Juan Pablo

No description provided.

Garrett Brown
Owner

Looks good

Garrett Brown garbear merged commit fb42d6c into from
Garrett Brown garbear closed this
Garrett Brown garbear referenced this pull request from a commit
Nigel Jones [nfs] Fix library syncing (trac #14727) for edge-cases resulting from…
… less-common NFS export configurations partially resulting from recent CStdString conversion.

Squashed commit of the following:

commit 1cd13db
Author: Nigel Jones <nigel@nigelj.com>
Date:   Sun Dec 8 02:47:08 2013 +1300

    [nfs] Recommendation from PR 3772 by jmarshallnz for code cleanup implemented avoiding the substr routine.

    exportPath is only set if a valid export is found.

commit be9d0b0
Merge: a43d406 d32ff6e
Author: Nigel Jones <nigel@nigelj.com>
Date:   Sat Dec 7 03:09:32 2013 -0800

    Merge pull request #1 from Memphiz/nfsfix-14727

    [nfs] - handle special case when "/" is exported via nfs - we need to al...

commit d32ff6e
Author: Memphiz <memphis@machzwo.de>
Date:   Fri Dec 6 23:35:48 2013 +0100

    [nfs] - handle special case when "/" is exported via nfs - we need to allow empty pathes here when accessing nfs://ip/ (path is empty here - export is "/").

commit a43d406
Author: Nigel Jones <nigel@nigelj.com>
Date:   Sat Dec 7 00:27:49 2013 +1300

    [nfs] - Ensure that the right export is picked if multiple overlapping names may match with StartsWith.

commit 61fb6f5
Author: Nigel Jones <nigel@nigelj.com>
Date:   Fri Dec 6 23:44:03 2013 +1300

    [nfs] replacement fix for dd4dd2e (issue #14727).

    If the exportPath is the same as the path is then bypass the substr methods, and return the correct relativePath.
f6dd667
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
6  xbmc/cores/RetroPlayer/RetroPlayerVideo.cpp
@@ -189,10 +189,16 @@ bool CRetroPlayerVideo::CheckConfiguration(const DVDVideoPicture &picture)
189 189
     switch (m_pixelFormat)
190 190
     {
191 191
     case RETRO_PIXEL_FORMAT_XRGB8888:
  192
+      CLog::Log(LOGINFO, "RetroPlayerVideo: Pixel Format: XRGB8888");
192 193
       format = PIX_FMT_ARGB;
193 194
       break;
  195
+    case RETRO_PIXEL_FORMAT_RGB565:    
  196
+  	  CLog::Log(LOGINFO, "RetroPlayerVideo: Pixel Format: RGB565");
  197
+      format = PIX_FMT_RGB565LE;
  198
+      break;
194 199
     case RETRO_PIXEL_FORMAT_0RGB1555:
195 200
     default:
  201
+      CLog::Log(LOGINFO, "RetroPlayerVideo: Pixel Format: RGB1555");
196 202
       format = PIX_FMT_RGB555LE;
197 203
       break;
198 204
     }
13  xbmc/games/GameClient.cpp
@@ -106,12 +106,12 @@ bool CGameClient::Init()
106 106
     return false;
107 107
   }
108 108
 
109  
-  CLog::Log(LOGERROR, "GameClient: ------------------------------------");
110  
-  CLog::Log(LOGERROR, "GameClient: Loaded DLL for %s", ID().c_str());
111  
-  CLog::Log(LOGERROR, "GameClient: Client: %s at version %s", m_clientName.c_str(), m_clientVersion.c_str());
112  
-  CLog::Log(LOGERROR, "GameClient: Valid extensions: %s", m_validExtensions.c_str());
113  
-  CLog::Log(LOGERROR, "GameClient: Allow VFS: %s, require zip: %s", m_bAllowVFS ? "yes" : "no", m_bRequireZip ? "yes" : "no");
114  
-  CLog::Log(LOGERROR, "GameClient: ------------------------------------");
  109
+  CLog::Log(LOGINFO, "GameClient: ------------------------------------");
  110
+  CLog::Log(LOGINFO, "GameClient: Loaded DLL for %s", ID().c_str());
  111
+  CLog::Log(LOGINFO, "GameClient: Client: %s at version %s", m_clientName.c_str(), m_clientVersion.c_str());
  112
+  CLog::Log(LOGINFO, "GameClient: Valid extensions: %s", m_validExtensions.c_str());
  113
+  CLog::Log(LOGINFO, "GameClient: Allow VFS: %s, require zip: %s", m_bAllowVFS ? "yes" : "no", m_bRequireZip ? "yes" : "no");
  114
+  CLog::Log(LOGINFO, "GameClient: ------------------------------------");
115 115
 
116 116
   return true;
117 117
 }
@@ -519,6 +519,7 @@ bool CGameClient::EnvironmentCallback(unsigned int cmd, void *data)
519 519
       // Validate the format
520 520
       switch (pix_fmt)
521 521
       {
  522
+      case RETRO_PIXEL_FORMAT_RGB565:
522 523
       case RETRO_PIXEL_FORMAT_0RGB1555: // 5 bit color, high byte must be zero
523 524
       case RETRO_PIXEL_FORMAT_XRGB8888: // 8 bit color, high byte is ignored
524 525
         SetPixelFormat(pix_fmt);
3  xbmc/games/libretro/libretro.h
@@ -361,7 +361,8 @@ enum retro_key
361 361
 enum retro_pixel_format
362 362
 {
363 363
    RETRO_PIXEL_FORMAT_0RGB1555 = 0, // 0RGB1555, native endian. 0 bit must be set to 0.
364  
-   RETRO_PIXEL_FORMAT_XRGB8888      // XRGB8888, native endian. X bits are ignored.
  364
+   RETRO_PIXEL_FORMAT_XRGB8888,      // XRGB8888, native endian. X bits are ignored.
  365
+   RETRO_PIXEL_FORMAT_RGB565
365 366
 };
366 367
 
367 368
 struct retro_message
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.