summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/video/mc6847.h
diff options
context:
space:
mode:
author robcfg <robcfg@gmail.com>2019-05-05 00:39:08 +0200
committer robcfg <robcfg@gmail.com>2019-05-05 00:39:08 +0200
commit4b9988cec162729cac69175078e9329bcb103950 (patch)
tree0617b7da50fd06059594dd06d126afb4d031b2b0 /src/devices/video/mc6847.h
parent2605c4d24396f689d64f5d86afa2f49ccff34d18 (diff)
Modified palette with colors taken from real composite video captures.
Diffstat (limited to 'src/devices/video/mc6847.h')
-rw-r--r--src/devices/video/mc6847.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/devices/video/mc6847.h b/src/devices/video/mc6847.h
index bd0994d23d7..9903ec3b718 100644
--- a/src/devices/video/mc6847.h
+++ b/src/devices/video/mc6847.h
@@ -190,6 +190,7 @@ protected:
if( !m_artifacting || !m_palartifacting )
return;
+ // TODO: Create a map of pairs of colors to resulting colors, and convert spaces to tabs.
//if( (mode & (MODE_AS|MODE_GM0)) == MODE_AS )
{
uint32_t tmpPixel;
@@ -208,9 +209,15 @@ protected:
if( luma1 != m_luminance_map.end() && luma2 != m_luminance_map.end() && (luma1->second == luma2->second))
{
- tmpPixel = (( ((line1[pixel] & 0xFF0000) >> 16) + ((line2[pixel] & 0xFF0000) >> 16) / 2) << 16);
- tmpPixel |= (( ((line1[pixel] & 0xFF00 ) >> 8 ) + ((line2[pixel] & 0xFF00 ) >> 8 ) / 2) << 8 );
- tmpPixel |= ( ( line1[pixel] & 0xFF ) + (line2[pixel] & 0xFF ) ) / 2;
+ /*tmpPixel = (((line1[pixel] & 0xFF000000) >> 25) + ((line2[pixel] & 0xFF000000) >> 24)) << 24;
+ tmpPixel |= (((line1[pixel] & 0x00FF0000) >> 17) + ((line2[pixel] & 0x00FF0000) >> 16)) << 16;
+ tmpPixel |= (((line1[pixel] & 0x0000FF00) >> 9) + ((line2[pixel] & 0x0000FF00) >> 8)) << 8;
+ tmpPixel |= (((line1[pixel] & 0x000000FF) >> 1) + ((line2[pixel] & 0x000000FF) >> 0)); */
+
+ //tmpPixel = (( ((uint32_t)(line1[pixel] & 0xFF000000) >> 24) + ((uint32_t)(line2[pixel] & 0xFF000000) >> 24) / 2) << 24);
+ tmpPixel = (( ((uint32_t)(line1[pixel] & 0xFF0000 ) >> 16) + ((uint32_t)(line2[pixel] & 0xFF0000 ) >> 16) / 2) << 16);
+ tmpPixel |= (( ((uint32_t)(line1[pixel] & 0xFF00 ) >> 8 ) + ((uint32_t)(line2[pixel] & 0xFF00 ) >> 8 ) / 2) << 8 );
+ tmpPixel |= ( ((uint32_t) line1[pixel] & 0xFF ) + (uint32_t)(line2[pixel] & 0xFF ) ) / 2;
line1[pixel] = tmpPixel;
line2[pixel] = tmpPixel;