mirror of
https://github.com/libretro/RetroArch
synced 2025-03-24 22:43:41 +00:00
Move netplay related bsv code to netplay.
This commit is contained in:
Themaister
parent
739bbe3aa6
commit
b273de1e99
32
general.h
32
general.h
@ -522,6 +522,38 @@ static inline uint8_t is_little_endian(void)
|
||||
return u.y[0];
|
||||
}
|
||||
|
||||
static inline uint32_t swap_if_big32(uint32_t val)
|
||||
{
|
||||
if (is_little_endian()) // Little-endian
|
||||
return val;
|
||||
else
|
||||
return (val >> 24) | ((val >> 8) & 0xFF00) | ((val << 8) & 0xFF0000) | (val << 24);
|
||||
}
|
||||
|
||||
static inline uint32_t swap_if_little32(uint32_t val)
|
||||
{
|
||||
if (is_little_endian())
|
||||
return (val >> 24) | ((val >> 8) & 0xFF00) | ((val << 8) & 0xFF0000) | (val << 24);
|
||||
else
|
||||
return val;
|
||||
}
|
||||
|
||||
static inline uint16_t swap_if_big16(uint16_t val)
|
||||
{
|
||||
if (is_little_endian())
|
||||
return val;
|
||||
else
|
||||
return (val >> 8) | (val << 8);
|
||||
}
|
||||
|
||||
static inline uint16_t swap_if_little16(uint16_t val)
|
||||
{
|
||||
if (is_little_endian())
|
||||
return (val >> 8) | (val << 8);
|
||||
else
|
||||
return val;
|
||||
}
|
||||
|
||||
#ifdef GEKKO
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
93
movie.c
93
movie.c
@ -40,38 +40,6 @@ struct bsv_movie
|
||||
bool did_rewind;
|
||||
};
|
||||
|
||||
#define BSV_MAGIC 0x42535631
|
||||
|
||||
#define MAGIC_INDEX 0
|
||||
#define SERIALIZER_INDEX 1
|
||||
#define CRC_INDEX 2
|
||||
#define STATE_SIZE_INDEX 3
|
||||
|
||||
// Convert to big-endian if needed
|
||||
static inline uint32_t swap_if_big32(uint32_t val)
|
||||
{
|
||||
if (is_little_endian()) // Little-endian
|
||||
return val;
|
||||
else
|
||||
return (val >> 24) | ((val >> 8) & 0xFF00) | ((val << 8) & 0xFF0000) | (val << 24);
|
||||
}
|
||||
|
||||
static inline uint32_t swap_if_little32(uint32_t val)
|
||||
{
|
||||
if (!is_little_endian()) // Big-endian
|
||||
return val;
|
||||
else
|
||||
return (val >> 24) | ((val >> 8) & 0xFF00) | ((val << 8) & 0xFF0000) | (val << 24);
|
||||
}
|
||||
|
||||
static inline uint16_t swap_if_big16(uint16_t val)
|
||||
{
|
||||
if (is_little_endian())
|
||||
return val;
|
||||
else
|
||||
return (val >> 8) | (val << 8);
|
||||
}
|
||||
|
||||
static bool init_playback(bsv_movie_t *handle, const char *path)
|
||||
{
|
||||
handle->playback = true;
|
||||
@ -267,64 +235,3 @@ void bsv_movie_frame_rewind(bsv_movie_t *handle)
|
||||
}
|
||||
}
|
||||
|
||||
uint32_t *bsv_header_generate(size_t *size, uint32_t magic)
|
||||
{
|
||||
uint32_t bsv_header[4] = {0};
|
||||
unsigned serialize_size = psnes_serialize_size();
|
||||
size_t header_size = sizeof(bsv_header) + serialize_size;
|
||||
*size = header_size;
|
||||
|
||||
uint32_t *header = (uint32_t*)malloc(header_size);
|
||||
if (!header)
|
||||
return NULL;
|
||||
|
||||
bsv_header[MAGIC_INDEX] = swap_if_little32(BSV_MAGIC);
|
||||
bsv_header[SERIALIZER_INDEX] = swap_if_big32(magic);
|
||||
bsv_header[CRC_INDEX] = swap_if_big32(g_extern.cart_crc);
|
||||
bsv_header[STATE_SIZE_INDEX] = swap_if_big32(serialize_size);
|
||||
|
||||
if (serialize_size && !psnes_serialize((uint8_t*)header + sizeof(bsv_header), serialize_size))
|
||||
{
|
||||
free(header);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
memcpy(header, bsv_header, sizeof(bsv_header));
|
||||
return header;
|
||||
}
|
||||
|
||||
bool bsv_parse_header(const uint32_t *header, uint32_t magic)
|
||||
{
|
||||
uint32_t in_bsv = swap_if_little32(header[MAGIC_INDEX]);
|
||||
if (in_bsv != BSV_MAGIC)
|
||||
{
|
||||
SSNES_ERR("BSV magic mismatch, got 0x%x, expected 0x%x.\n",
|
||||
in_bsv, BSV_MAGIC);
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32_t in_magic = swap_if_big32(header[SERIALIZER_INDEX]);
|
||||
if (in_magic != magic)
|
||||
{
|
||||
SSNES_ERR("Magic mismatch, got 0x%x, expected 0x%x.\n", in_magic, magic);
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32_t in_crc = swap_if_big32(header[CRC_INDEX]);
|
||||
if (in_crc != g_extern.cart_crc)
|
||||
{
|
||||
SSNES_ERR("CRC32 mismatch, got 0x%x, expected 0x%x.\n", in_crc, g_extern.cart_crc);
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32_t in_state_size = swap_if_big32(header[STATE_SIZE_INDEX]);
|
||||
if (in_state_size != psnes_serialize_size())
|
||||
{
|
||||
SSNES_ERR("Serialization size mismatch, got 0x%x, expected 0x%x.\n",
|
||||
in_state_size, psnes_serialize_size());
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
10
movie.h
10
movie.h
@ -22,6 +22,13 @@
|
||||
#include <stddef.h>
|
||||
#include "boolean.h"
|
||||
|
||||
#define BSV_MAGIC 0x42535631
|
||||
|
||||
#define MAGIC_INDEX 0
|
||||
#define SERIALIZER_INDEX 1
|
||||
#define CRC_INDEX 2
|
||||
#define STATE_SIZE_INDEX 3
|
||||
|
||||
typedef struct bsv_movie bsv_movie_t;
|
||||
|
||||
enum ssnes_movie_type
|
||||
@ -30,9 +37,6 @@ enum ssnes_movie_type
|
||||
SSNES_MOVIE_RECORD
|
||||
};
|
||||
|
||||
uint32_t *bsv_header_generate(size_t *size, uint32_t magic);
|
||||
bool bsv_parse_header(const uint32_t *header, uint32_t magic);
|
||||
|
||||
bsv_movie_t *bsv_movie_init(const char *path, enum ssnes_movie_type type);
|
||||
|
||||
// Playback
|
||||
|
||||
69
netplay.c
69
netplay.c
@ -608,6 +608,67 @@ static bool get_info(netplay_t *handle)
|
||||
return true;
|
||||
}
|
||||
|
||||
static uint32_t *bsv_header_generate(size_t *size, uint32_t magic)
|
||||
{
|
||||
uint32_t bsv_header[4] = {0};
|
||||
unsigned serialize_size = psnes_serialize_size();
|
||||
size_t header_size = sizeof(bsv_header) + serialize_size;
|
||||
*size = header_size;
|
||||
|
||||
uint32_t *header = (uint32_t*)malloc(header_size);
|
||||
if (!header)
|
||||
return NULL;
|
||||
|
||||
bsv_header[MAGIC_INDEX] = swap_if_little32(BSV_MAGIC);
|
||||
bsv_header[SERIALIZER_INDEX] = swap_if_big32(magic);
|
||||
bsv_header[CRC_INDEX] = swap_if_big32(g_extern.cart_crc);
|
||||
bsv_header[STATE_SIZE_INDEX] = swap_if_big32(serialize_size);
|
||||
|
||||
if (serialize_size && !psnes_serialize((uint8_t*)header + sizeof(bsv_header), serialize_size))
|
||||
{
|
||||
free(header);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
memcpy(header, bsv_header, sizeof(bsv_header));
|
||||
return header;
|
||||
}
|
||||
|
||||
static bool bsv_parse_header(const uint32_t *header, uint32_t magic)
|
||||
{
|
||||
uint32_t in_bsv = swap_if_little32(header[MAGIC_INDEX]);
|
||||
if (in_bsv != BSV_MAGIC)
|
||||
{
|
||||
SSNES_ERR("BSV magic mismatch, got 0x%x, expected 0x%x.\n",
|
||||
in_bsv, BSV_MAGIC);
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32_t in_magic = swap_if_big32(header[SERIALIZER_INDEX]);
|
||||
if (in_magic != magic)
|
||||
{
|
||||
SSNES_ERR("Magic mismatch, got 0x%x, expected 0x%x.\n", in_magic, magic);
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32_t in_crc = swap_if_big32(header[CRC_INDEX]);
|
||||
if (in_crc != g_extern.cart_crc)
|
||||
{
|
||||
SSNES_ERR("CRC32 mismatch, got 0x%x, expected 0x%x.\n", in_crc, g_extern.cart_crc);
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32_t in_state_size = swap_if_big32(header[STATE_SIZE_INDEX]);
|
||||
if (in_state_size != psnes_serialize_size())
|
||||
{
|
||||
SSNES_ERR("Serialization size mismatch, got 0x%x, expected 0x%x.\n",
|
||||
in_state_size, psnes_serialize_size());
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool get_info_spectate(netplay_t *handle)
|
||||
{
|
||||
if (!send_nickname(handle, handle->fd))
|
||||
@ -1178,14 +1239,6 @@ static void netplay_pre_frame_net(netplay_t *handle)
|
||||
input_poll_net();
|
||||
}
|
||||
|
||||
static inline uint16_t swap_if_big16(uint16_t input)
|
||||
{
|
||||
if (is_little_endian())
|
||||
return input;
|
||||
else
|
||||
return (input << 8) | (input >> 8);
|
||||
}
|
||||
|
||||
static void netplay_set_spectate_input(netplay_t *handle, int16_t input)
|
||||
{
|
||||
if (handle->spectate_input_ptr >= handle->spectate_input_size)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user