Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Added RGB565 support. #1

Merged
merged 4 commits into from

2 participants

@elpendor

No description provided.

@garbear
Owner

Looks good

@garbear garbear merged commit fb42d6c into garbear:retroplayer
@garbear garbear referenced this pull request from a commit
@nigeljonez nigeljonez [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 1cd13db9822a5a609c232a614e67c361ca260f2d
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 be9d0b0aa42b4710a5005824c1d04f1a69120cbc
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
Commits on Dec 14, 2012
  1. @elpendor
  2. @elpendor

    Missing definition

    elpendor authored
  3. @elpendor

    Added RGB565 support.

    elpendor authored
  4. @elpendor

    Log Typo

    elpendor authored
This page is out of date. Refresh to see the latest.
View
6 xbmc/cores/RetroPlayer/RetroPlayerVideo.cpp
@@ -189,10 +189,16 @@ bool CRetroPlayerVideo::CheckConfiguration(const DVDVideoPicture &picture)
switch (m_pixelFormat)
{
case RETRO_PIXEL_FORMAT_XRGB8888:
+ CLog::Log(LOGINFO, "RetroPlayerVideo: Pixel Format: XRGB8888");
format = PIX_FMT_ARGB;
break;
+ case RETRO_PIXEL_FORMAT_RGB565:
+ CLog::Log(LOGINFO, "RetroPlayerVideo: Pixel Format: RGB565");
+ format = PIX_FMT_RGB565LE;
+ break;
case RETRO_PIXEL_FORMAT_0RGB1555:
default:
+ CLog::Log(LOGINFO, "RetroPlayerVideo: Pixel Format: RGB1555");
format = PIX_FMT_RGB555LE;
break;
}
View
13 xbmc/games/GameClient.cpp
@@ -106,12 +106,12 @@ bool CGameClient::Init()
return false;
}
- CLog::Log(LOGERROR, "GameClient: ------------------------------------");
- CLog::Log(LOGERROR, "GameClient: Loaded DLL for %s", ID().c_str());
- CLog::Log(LOGERROR, "GameClient: Client: %s at version %s", m_clientName.c_str(), m_clientVersion.c_str());
- CLog::Log(LOGERROR, "GameClient: Valid extensions: %s", m_validExtensions.c_str());
- CLog::Log(LOGERROR, "GameClient: Allow VFS: %s, require zip: %s", m_bAllowVFS ? "yes" : "no", m_bRequireZip ? "yes" : "no");
- CLog::Log(LOGERROR, "GameClient: ------------------------------------");
+ CLog::Log(LOGINFO, "GameClient: ------------------------------------");
+ CLog::Log(LOGINFO, "GameClient: Loaded DLL for %s", ID().c_str());
+ CLog::Log(LOGINFO, "GameClient: Client: %s at version %s", m_clientName.c_str(), m_clientVersion.c_str());
+ CLog::Log(LOGINFO, "GameClient: Valid extensions: %s", m_validExtensions.c_str());
+ CLog::Log(LOGINFO, "GameClient: Allow VFS: %s, require zip: %s", m_bAllowVFS ? "yes" : "no", m_bRequireZip ? "yes" : "no");
+ CLog::Log(LOGINFO, "GameClient: ------------------------------------");
return true;
}
@@ -519,6 +519,7 @@ bool CGameClient::EnvironmentCallback(unsigned int cmd, void *data)
// Validate the format
switch (pix_fmt)
{
+ case RETRO_PIXEL_FORMAT_RGB565:
case RETRO_PIXEL_FORMAT_0RGB1555: // 5 bit color, high byte must be zero
case RETRO_PIXEL_FORMAT_XRGB8888: // 8 bit color, high byte is ignored
SetPixelFormat(pix_fmt);
View
3  xbmc/games/libretro/libretro.h
@@ -361,7 +361,8 @@ enum retro_key
enum retro_pixel_format
{
RETRO_PIXEL_FORMAT_0RGB1555 = 0, // 0RGB1555, native endian. 0 bit must be set to 0.
- RETRO_PIXEL_FORMAT_XRGB8888 // XRGB8888, native endian. X bits are ignored.
+ RETRO_PIXEL_FORMAT_XRGB8888, // XRGB8888, native endian. X bits are ignored.
+ RETRO_PIXEL_FORMAT_RGB565
};
struct retro_message
Something went wrong with that request. Please try again.