The-Homebrew-Cloud
/
frodo-wii
mirror of https://github.com/Oibaf66/frodo-wii.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added diff update as well, more frequent kb/s updates

This commit is contained in:
simon.kagstrom 2009-01-25 10:07:51 +00:00
parent c2a49cde0f
commit 404dfdc409
5 changed files with 187 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Src/C64_SDL.h
View File

@ -615,7 +615,7 @@ void C64::VBlank(bool draw_frame)
bytes_sent += remote->GetBytesSent();
}
if (now - last_time_update > 1000)
if (now - last_time_update > 300)
{
TheDisplay->NetworkTrafficMeter(((bytes_sent * 1000.0) /
((float)now - last_time_update)) / 1024.0);

8
Src/Display_SDL.h
View File

@ -227,6 +227,14 @@ void C64Display::Update(uint8 *src_pixels)
}
draw_string(real_screen, 0, 0, networktraffic_string, black, fill_gray);
if (this->TheC64->network_server) {
for (int i = 0; i < this->TheC64->network_server->n_clients; i++)
{
NetworkClient *client = this->TheC64->network_server->clients[i];
client->DrawTransferredBlocks(real_screen);
}
}
SDL_Flip(real_screen);
}

140
Src/Network.cpp
View File

@ -39,8 +39,13 @@ Network::Network()
/* "big enough" static buffer */
this->ud = (NetworkUpdate*)malloc( size );
this->tmp_ud = (NetworkUpdate*)malloc( size );
this->ResetNetworkUpdate();
this->bytes_sent = 0;
this->square_updated = (Uint32*)malloc( N_SQUARES_W * N_SQUARES_H * sizeof(Uint32));
assert(this->square_updated);
memset(this->square_updated, 0, N_SQUARES_W * N_SQUARES_H * sizeof(Uint32));
}
Network::~Network()
@ -69,6 +74,35 @@ size_t Network::EncodeDisplayRaw(struct NetworkDisplayUpdate *dst, Uint8 *screen
return RAW_SIZE;
}
size_t Network::EncodeDisplayDiff(struct NetworkDisplayUpdate *dst, Uint8 *screen,
Uint8 *remote, int x_start, int y_start)
{
size_t out = 0;
size_t len = 0;
dst->type = DISPLAY_UPDATE_DIFF;
for (int y = y_start; y < y_start + SQUARE_H; y++)
{
for (int x = x_start; x < x_start + SQUARE_W; x++)
{
Uint8 s = screen[ y * DISPLAY_X + x ];
Uint8 r = remote[ y * DISPLAY_X + x ];
if (r != s || len >= 255)
{
dst->data[out] = len;
dst->data[out + 1] = s;
out += 2;
len = 0;
}
len++;
}
}
return out;
}
size_t Network::EncodeDisplayRLE(struct NetworkDisplayUpdate *dst, Uint8 *screen,
int x_start, int y_start)
{
@ -142,6 +176,33 @@ size_t Network::EncodeSoundRaw(struct NetworkSoundUpdate *dst,
return len;
}
bool Network::DecodeDisplayDiff(Uint8 *screen, struct NetworkDisplayUpdate *src,
int x_start, int y_start)
{
int p = 0;
int x = x_start;
int y = y_start;
int sz = src->size - sizeof(NetworkDisplayUpdate);
/* Something is wrong if this is true... */
if (sz % 2 != 0)
return false;
while (p < sz)
{
Uint8 len = src->data[p];
Uint8 color = src->data[p+1];
int x_diff = (x - x_start + len) % SQUARE_W;
int y_diff = (x - x_start + len) / SQUARE_W;
x = x_start + x_diff;
y = y + y_diff;
screen[y * DISPLAY_X + x] = color;
p += 2;
}
return true;
}
bool Network::DecodeDisplayRLE(Uint8 *screen, struct NetworkDisplayUpdate *src,
int x_start, int y_start)
@ -200,17 +261,30 @@ bool Network::DecodeDisplayRaw(Uint8 *screen, struct NetworkDisplayUpdate *src,
/* Public methods */
size_t Network::EncodeDisplaySquare(struct NetworkDisplayUpdate *dst,
Uint8 *screen, int square)
Uint8 *screen, Uint8 *remote, int square)
{
const int square_x = SQUARE_TO_X(square);
const int square_y = SQUARE_TO_Y(square);
size_t out;
size_t out, diff_out;
dst->square = square;
/* Try encoding as RLE, but if it's too large, go for RAW */
/* Try encoding as RLE and diff, but if it's too large, go for RAW */
diff_out = this->EncodeDisplayDiff((NetworkDisplayUpdate*)this->tmp_ud, screen,
remote, square_x, square_y);
out = this->EncodeDisplayRLE(dst, screen, square_x, square_y);
if (out > RAW_SIZE)
this->square_updated[square] = out | (1 << 16);
if (out > diff_out) {
/* The diff is best, use that */
this->square_updated[square] = out | (2 << 16);
memcpy(dst, this->tmp_ud, out + sizeof(NetworkDisplayUpdate));
out = diff_out;
}
if (out > RAW_SIZE) {
out = this->EncodeDisplayRaw(dst, screen, square_x, square_y);
this->square_updated[square] = out;
}
dst->size = out + sizeof(struct NetworkDisplayUpdate);
return dst->size;
@ -220,10 +294,10 @@ bool Network::CompareSquare(Uint8 *a, Uint8 *b)
{
for (int y = 0; y < SQUARE_H; y++)
{
for (int x = 0; x < SQUARE_W; x++)
for (int x = 0; x < SQUARE_W; x += 4)
{
Uint8 va = a[ y * DISPLAY_X + x ];
Uint8 vb = b[ y * DISPLAY_X + x ];
Uint32 va = *((Uint32*)&a[ y * DISPLAY_X + x ]);
Uint32 vb = *((Uint32*)&b[ y * DISPLAY_X + x ]);
if (va != vb)
return false;
@ -245,9 +319,11 @@ size_t Network::EncodeDisplay(Uint8 *master, Uint8 *remote)
NetworkDisplayUpdate *dst = (NetworkDisplayUpdate *)this->cur_ud;
/* Updated, encode this */
this->EncodeDisplaySquare(dst, master, sq);
this->EncodeDisplaySquare(dst, master, remote, sq);
this->AddNetworkUpdate((NetworkUpdate*)dst);
}
else
this->square_updated[sq] = 0;
}
/* Everything encoded, store in remote */
@ -262,9 +338,11 @@ bool Network::DecodeDisplayUpdate(Uint8 *screen,
const int square_x = SQUARE_TO_X(square);
const int square_y = SQUARE_TO_Y(square);
if (src->type == DISPLAY_UPDATE_RAW)
if (src->type == DISPLAY_UPDATE_DIFF)
return this->DecodeDisplayDiff(screen, src, square_x, square_y);
else if (src->type == DISPLAY_UPDATE_RAW)
return this->DecodeDisplayRaw(screen, src, square_x, square_y);
if (src->type == DISPLAY_UPDATE_RLE)
else if (src->type == DISPLAY_UPDATE_RLE)
return this->DecodeDisplayRLE(screen, src, square_x, square_y);
/* Error */
@ -311,12 +389,49 @@ size_t Network::DecodeSoundUpdate(struct NetworkSoundUpdate *src, char *buf)
void Network::ResetNetworkUpdate(void)
{
memset(this->ud, 0, NETWORK_UPDATE_SIZE);
memset(this->tmp_ud, 0, NETWORK_UPDATE_SIZE);
this->ud->type = HEADER;
this->ud->size = sizeof(NetworkUpdate);
this->cur_ud = (Uint8*)(this->ud->data);
}
void Network::DrawTransferredBlocks(SDL_Surface *screen)
{
const int x_border = (DISPLAY_X - FULL_DISPLAY_X / 2);
const int y_border = (DISPLAY_Y - FULL_DISPLAY_Y / 2);
for (int sq = 0; sq < N_SQUARES_W * N_SQUARES_H; sq++)
{
int x = SQUARE_TO_X(sq) * 2 - x_border;
int y = SQUARE_TO_Y(sq) * 2 - y_border;
int w = SQUARE_W * 2;
int h = SQUARE_H * 2;
if (this->square_updated[sq])
{
SDL_Rect l = {x, y, 1, h};
SDL_Rect r = {x + w, y, 1, h};
SDL_Rect u = {x, y, w, 1};
SDL_Rect d = {x, y + h, w, 1};
Uint32 raw = this->square_updated[sq];
SDL_Rect size = {x, y, (raw & 0xffff) / 17, 4};
Uint32 color = 4;
if ((raw >> 16) == 1)
color = 5;
else if ((raw >> 16) == 2)
color = 6;
SDL_FillRect(screen, &l, 19);
SDL_FillRect(screen, &r, 19);
SDL_FillRect(screen, &u, 19);
SDL_FillRect(screen, &d, 19);
SDL_FillRect(screen, &size, color);
}
}
}
bool Network::ReceiveUpdate(int sock)
{
@ -356,6 +471,7 @@ void Network::MarshalData(NetworkUpdate *ud)
{
case DISPLAY_UPDATE_RAW:
case DISPLAY_UPDATE_RLE:
case DISPLAY_UPDATE_DIFF:
case SOUND_UPDATE_RAW: /* Not really true, but looks the same */
case SOUND_UPDATE_RLE:
{
@ -388,6 +504,7 @@ void Network::DeMarshalData(NetworkUpdate *ud)
{
case DISPLAY_UPDATE_RAW:
case DISPLAY_UPDATE_RLE:
case DISPLAY_UPDATE_DIFF:
case SOUND_UPDATE_RAW: /* Not really true, but looks the same */
case SOUND_UPDATE_RLE:
{
@ -419,6 +536,7 @@ bool Network::DecodeUpdate(uint8 *screen)
{
case DISPLAY_UPDATE_RAW:
case DISPLAY_UPDATE_RLE:
case DISPLAY_UPDATE_DIFF:
this->DecodeDisplayUpdate(screen, (NetworkDisplayUpdate*)p);
break;
default:
@ -463,7 +581,7 @@ void NetworkServer::AddClient(int sock)
}
NetworkClient::NetworkClient(int sock)
NetworkClient::NetworkClient(int sock) : Network()
{
this->sock = sock;

84
Src/Network.h
View File

@ -10,10 +10,11 @@ enum
HEADER = 0,
DISPLAY_UPDATE_RAW = 1,
DISPLAY_UPDATE_RLE = 2,
SOUND_UPDATE_RAW = 3,
SOUND_UPDATE_RLE = 4,
KEYBOARD_UPDATE = 5,
JOYSTICK_UPDATE = 6,
DISPLAY_UPDATE_DIFF= 3,
SOUND_UPDATE_RAW = 4,
SOUND_UPDATE_RLE = 5,
KEYBOARD_UPDATE = 6,
JOYSTICK_UPDATE = 7,
};
struct NetworkDisplayUpdate
@ -57,6 +58,31 @@ public:
~Network();
size_t EncodeDisplay(Uint8 *master, Uint8 *remote);
bool DecodeUpdate(uint8 *screen);
void ResetNetworkUpdate(void);
void DrawTransferredBlocks(SDL_Surface *screen);
size_t GetBytesSent() {
return this->bytes_sent;
}
void ResetBytesSent() {
this->bytes_sent = 0;
}
bool SendUpdate(int sock);
bool ReceiveUpdate(int sock);
bool ReceiveUpdateBlock(int sock);
protected:
size_t DecodeSoundUpdate(struct NetworkSoundUpdate *src, char *buf);
/** Encode part of a screen into @a dst
*
* @param dst the destination update structure
@ -66,9 +92,21 @@ public:
* @return the size of the encoded message
*/
size_t EncodeDisplaySquare(struct NetworkDisplayUpdate *dst,
Uint8 *screen, int square);
Uint8 *screen, Uint8 *remote, int square);
size_t EncodeDisplay(Uint8 *master, Uint8 *remote);
size_t EncodeDisplayDiff(struct NetworkDisplayUpdate *dst, Uint8 *screen,
int x, int y);
size_t EncodeDisplayDiff(struct NetworkDisplayUpdate *dst, Uint8 *screen,
Uint8 *remote, int x, int y);
size_t EncodeDisplayRLE(struct NetworkDisplayUpdate *dst, Uint8 *screen,
int x, int y);
size_t EncodeDisplayRaw(struct NetworkDisplayUpdate *dst, Uint8 *screen,
int x, int y);
size_t EncodeSoundRLE(struct NetworkSoundUpdate *dst,
Uint8 *buffer, size_t len);
size_t EncodeSoundRaw(struct NetworkSoundUpdate *dst,
Uint8 *buffer, size_t len);
/**
* Encode the @a buf sound buffer into @a dst
@ -92,36 +130,6 @@ public:
* @param src the message to decode
*/
bool DecodeDisplayUpdate(Uint8 *screen, struct NetworkDisplayUpdate *src);
size_t DecodeSoundUpdate(struct NetworkSoundUpdate *src, char *buf);
bool DecodeUpdate(uint8 *screen);
void ResetNetworkUpdate(void);
bool SendUpdate(int sock);
bool ReceiveUpdate(int sock);
bool ReceiveUpdateBlock(int sock);
size_t GetBytesSent() {
return this->bytes_sent;
}
void ResetBytesSent() {
this->bytes_sent = 0;
}
private:
size_t EncodeDisplayRLE(struct NetworkDisplayUpdate *dst, Uint8 *screen,
int x, int y);
size_t EncodeDisplayRaw(struct NetworkDisplayUpdate *dst, Uint8 *screen,
int x, int y);
size_t EncodeSoundRLE(struct NetworkSoundUpdate *dst,
Uint8 *buffer, size_t len);
size_t EncodeSoundRaw(struct NetworkSoundUpdate *dst,
Uint8 *buffer, size_t len);
NetworkUpdate *IterateFirst(NetworkUpdate *p, unsigned int *cookie);
@ -139,6 +147,8 @@ private:
*/
bool CompareSquare(Uint8 *a, Uint8 *b);
bool DecodeDisplayDiff(Uint8 *screen, struct NetworkDisplayUpdate *src,
int x, int y);
bool DecodeDisplayRLE(Uint8 *screen, struct NetworkDisplayUpdate *src,
int x, int y);
bool DecodeDisplayRaw(Uint8 *screen, struct NetworkDisplayUpdate *src,
@ -151,8 +161,10 @@ private:
void DeMarshalData(NetworkUpdate *ud);
NetworkUpdate *ud;
NetworkUpdate *tmp_ud;
Uint8 *cur_ud;
size_t bytes_sent;
Uint32 *square_updated;
};
class NetworkClient : public Network

2
Src/NetworkUnix.h
View File

@ -56,7 +56,7 @@ bool init_sockaddr (struct sockaddr_in *name,
}
NetworkServer::NetworkServer(int port)
NetworkServer::NetworkServer(int port) : Network()
{
this->n_clients = 0;
this->listen_sock = make_socket(port);