Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added RGB565 support. #1

Merged
merged 4 commits into from Dec 15, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions xbmc/cores/RetroPlayer/RetroPlayerVideo.cpp
Expand Up @@ -189,10 +189,16 @@ bool CRetroPlayerVideo::CheckConfiguration(const DVDVideoPicture &picture)
switch (m_pixelFormat) switch (m_pixelFormat)
{ {
case RETRO_PIXEL_FORMAT_XRGB8888: case RETRO_PIXEL_FORMAT_XRGB8888:
CLog::Log(LOGINFO, "RetroPlayerVideo: Pixel Format: XRGB8888");
format = PIX_FMT_ARGB; format = PIX_FMT_ARGB;
break; break;
case RETRO_PIXEL_FORMAT_RGB565:
CLog::Log(LOGINFO, "RetroPlayerVideo: Pixel Format: RGB565");
format = PIX_FMT_RGB565LE;
break;
case RETRO_PIXEL_FORMAT_0RGB1555: case RETRO_PIXEL_FORMAT_0RGB1555:
default: default:
CLog::Log(LOGINFO, "RetroPlayerVideo: Pixel Format: RGB1555");
format = PIX_FMT_RGB555LE; format = PIX_FMT_RGB555LE;
break; break;
} }
Expand Down
13 changes: 7 additions & 6 deletions xbmc/games/GameClient.cpp
Expand Up @@ -106,12 +106,12 @@ bool CGameClient::Init()
return false; return false;
} }


CLog::Log(LOGERROR, "GameClient: ------------------------------------"); CLog::Log(LOGINFO, "GameClient: ------------------------------------");
CLog::Log(LOGERROR, "GameClient: Loaded DLL for %s", ID().c_str()); CLog::Log(LOGINFO, "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(LOGINFO, "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(LOGINFO, "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(LOGINFO, "GameClient: Allow VFS: %s, require zip: %s", m_bAllowVFS ? "yes" : "no", m_bRequireZip ? "yes" : "no");
CLog::Log(LOGERROR, "GameClient: ------------------------------------"); CLog::Log(LOGINFO, "GameClient: ------------------------------------");


return true; return true;
} }
Expand Down Expand Up @@ -519,6 +519,7 @@ bool CGameClient::EnvironmentCallback(unsigned int cmd, void *data)
// Validate the format // Validate the format
switch (pix_fmt) 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_0RGB1555: // 5 bit color, high byte must be zero
case RETRO_PIXEL_FORMAT_XRGB8888: // 8 bit color, high byte is ignored case RETRO_PIXEL_FORMAT_XRGB8888: // 8 bit color, high byte is ignored
SetPixelFormat(pix_fmt); SetPixelFormat(pix_fmt);
Expand Down
3 changes: 2 additions & 1 deletion xbmc/games/libretro/libretro.h
Expand Up @@ -361,7 +361,8 @@ enum retro_key
enum retro_pixel_format enum retro_pixel_format
{ {
RETRO_PIXEL_FORMAT_0RGB1555 = 0, // 0RGB1555, native endian. 0 bit must be set to 0. 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 struct retro_message
Expand Down