mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Let's have just one endian conversion macro suite.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@475 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-02-03 14:39:39 +00:00
parent 5c01c1029f
commit d9bfd5b294
3 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
polyp/endianmacros.h
View file

@ -33,6 +33,9 @@
#define INT32_SWAP(x) ( (int32_t) ( ((uint32_t) x >> 24) | ((uint32_t) x << 24) | (((uint32_t) x & 0xFF00) << 8) | ((((uint32_t) x) >> 8) & 0xFF00) ) ) #define INT32_SWAP(x) ( (int32_t) ( ((uint32_t) x >> 24) | ((uint32_t) x << 24) | (((uint32_t) x & 0xFF00) << 8) | ((((uint32_t) x) >> 8) & 0xFF00) ) )
#define UINT32_SWAP(x) ( (uint32_t) ( ((uint32_t) x >> 24) | ((uint32_t) x << 24) | (((uint32_t) x & 0xFF00) << 8) | ((((uint32_t) x) >> 8) & 0xFF00) ) ) #define UINT32_SWAP(x) ( (uint32_t) ( ((uint32_t) x >> 24) | ((uint32_t) x << 24) | (((uint32_t) x & 0xFF00) << 8) | ((((uint32_t) x) >> 8) & 0xFF00) ) )
#define MAYBE_INT32_SWAP(c,x) ((c) ? INT32_SWAP(x) : x)
#define MAYBE_UINT32_SWAP(c,x) ((c) ? UINT32_SWAP(x) : x)
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
#define INT16_FROM_LE(x) INT16_SWAP(x) #define INT16_FROM_LE(x) INT16_SWAP(x)
#define INT16_FROM_BE(x) ((int16_t)(x)) #define INT16_FROM_BE(x) ((int16_t)(x))

6
polyp/esound.h
View file

@ -200,14 +200,10 @@ enum esd_client_state {
}; };
typedef int esd_client_state_t; typedef int esd_client_state_t;
/* switch endian order for cross platform playing */
#define swap_endian_32(x) ((x >> 24) | ((x >> 8) & 0xFF00) | (((x & 0xFF00) << 8)) | (x << 24))
#define maybe_swap_endian_32(c,x) ((c) ? swap_endian_32(x) : x)
/* the endian key is transferred in binary, if it's read into int, */ /* the endian key is transferred in binary, if it's read into int, */
/* and matches ESD_ENDIAN_KEY (ENDN), then the endianness of the */ /* and matches ESD_ENDIAN_KEY (ENDN), then the endianness of the */
/* server and the client match; if it's SWAP_ENDIAN_KEY, swap data */ /* server and the client match; if it's SWAP_ENDIAN_KEY, swap data */
#define ESD_SWAP_ENDIAN_KEY ((uint32_t) swap_endian_32(ESD_ENDIAN_KEY)) #define ESD_SWAP_ENDIAN_KEY (UINT32_SWAP(ESD_ENDIAN_KEY))
#endif #endif

54
polyp/protocol-esound.c
View file

@ -46,6 +46,7 @@
#include "xmalloc.h" #include "xmalloc.h"
#include "log.h" #include "log.h"
#include "util.h" #include "util.h"
#include "endianmacros.h"
/* Don't accept more connection than this */ /* Don't accept more connection than this */
#define MAX_CONNECTIONS 10 #define MAX_CONNECTIONS 10
@ -301,8 +302,8 @@ static int esd_proto_stream_play(struct connection *c, PA_GCC_UNUSED esd_proto_t
size_t l; size_t l;
assert(c && length == (sizeof(int)*2+ESD_NAME_MAX)); assert(c && length == (sizeof(int)*2+ESD_NAME_MAX));
format = maybe_swap_endian_32(c->swap_byte_order, *(const int*)data); format = MAYBE_INT32_SWAP(c->swap_byte_order, *(const int*)data);
rate = maybe_swap_endian_32(c->swap_byte_order, *((const int*)data + 1)); rate = MAYBE_INT32_SWAP(c->swap_byte_order, *((const int*)data + 1));
ss.rate = rate; ss.rate = rate;
format_esd2native(format, c->swap_byte_order, &ss); format_esd2native(format, c->swap_byte_order, &ss);
@ -357,8 +358,8 @@ static int esd_proto_stream_record(struct connection *c, esd_proto_t request, co
size_t l; size_t l;
assert(c && length == (sizeof(int)*2+ESD_NAME_MAX)); assert(c && length == (sizeof(int)*2+ESD_NAME_MAX));
format = maybe_swap_endian_32(c->swap_byte_order, *(const int*)data); format = MAYBE_INT32_SWAP(c->swap_byte_order, *(const int*)data);
rate = maybe_swap_endian_32(c->swap_byte_order, *((const int*)data + 1)); rate = MAYBE_INT32_SWAP(c->swap_byte_order, *((const int*)data + 1));
ss.rate = rate; ss.rate = rate;
format_esd2native(format, c->swap_byte_order, &ss); format_esd2native(format, c->swap_byte_order, &ss);
@ -433,7 +434,7 @@ static int esd_proto_get_latency(struct connection *c, PA_GCC_UNUSED esd_proto_t
lag = connection_write(c, sizeof(int)); lag = connection_write(c, sizeof(int));
assert(lag); assert(lag);
*lag = c->swap_byte_order ? swap_endian_32(latency) : latency; *lag = MAYBE_INT32_SWAP(c->swap_byte_order, latency);
return 0; return 0;
} }
@ -451,8 +452,8 @@ static int esd_proto_server_info(struct connection *c, PA_GCC_UNUSED esd_proto_t
response = connection_write(c, sizeof(int)*3); response = connection_write(c, sizeof(int)*3);
assert(response); assert(response);
*(response++) = 0; *(response++) = 0;
*(response++) = maybe_swap_endian_32(c->swap_byte_order, rate); *(response++) = MAYBE_INT32_SWAP(c->swap_byte_order, rate);
*(response++) = maybe_swap_endian_32(c->swap_byte_order, format); *(response++) = MAYBE_INT32_SWAP(c->swap_byte_order, format);
return 0; return 0;
} }
@ -489,7 +490,7 @@ static int esd_proto_all_info(struct connection *c, esd_proto_t request, const v
} }
/* id */ /* id */
*((int*) response) = maybe_swap_endian_32(c->swap_byte_order, (int) (conn->index+1)); *((int*) response) = MAYBE_INT32_SWAP(c->swap_byte_order, (int) (conn->index+1));
response += sizeof(int); response += sizeof(int);
/* name */ /* name */
@ -498,19 +499,19 @@ static int esd_proto_all_info(struct connection *c, esd_proto_t request, const v
response += ESD_NAME_MAX; response += ESD_NAME_MAX;
/* rate */ /* rate */
*((int*) response) = maybe_swap_endian_32(c->swap_byte_order, rate); *((int*) response) = MAYBE_INT32_SWAP(c->swap_byte_order, rate);
response += sizeof(int); response += sizeof(int);
/* left */ /* left */
*((int*) response) = maybe_swap_endian_32(c->swap_byte_order, lvolume); *((int*) response) = MAYBE_INT32_SWAP(c->swap_byte_order, lvolume);
response += sizeof(int); response += sizeof(int);
/*right*/ /*right*/
*((int*) response) = maybe_swap_endian_32(c->swap_byte_order, rvolume); *((int*) response) = MAYBE_INT32_SWAP(c->swap_byte_order, rvolume);
response += sizeof(int); response += sizeof(int);
/*format*/ /*format*/
*((int*) response) = maybe_swap_endian_32(c->swap_byte_order, format); *((int*) response) = MAYBE_INT32_SWAP(c->swap_byte_order, format);
response += sizeof(int); response += sizeof(int);
t-= k; t-= k;
@ -529,7 +530,7 @@ static int esd_proto_all_info(struct connection *c, esd_proto_t request, const v
assert(t >= s*2); assert(t >= s*2);
/* id */ /* id */
*((int*) response) = maybe_swap_endian_32(c->swap_byte_order, (int) (ce->index+1)); *((int*) response) = MAYBE_INT32_SWAP(c->swap_byte_order, (int) (ce->index+1));
response += sizeof(int); response += sizeof(int);
/* name */ /* name */
@ -540,23 +541,23 @@ static int esd_proto_all_info(struct connection *c, esd_proto_t request, const v
response += ESD_NAME_MAX; response += ESD_NAME_MAX;
/* rate */ /* rate */
*((int*) response) = maybe_swap_endian_32(c->swap_byte_order, ce->sample_spec.rate); *((int*) response) = MAYBE_INT32_SWAP(c->swap_byte_order, ce->sample_spec.rate);
response += sizeof(int); response += sizeof(int);
/* left */ /* left */
*((int*) response) = maybe_swap_endian_32(c->swap_byte_order, (ce->volume.values[0]*ESD_VOLUME_BASE)/PA_VOLUME_NORM); *((int*) response) = MAYBE_INT32_SWAP(c->swap_byte_order, (ce->volume.values[0]*ESD_VOLUME_BASE)/PA_VOLUME_NORM);
response += sizeof(int); response += sizeof(int);
/*right*/ /*right*/
*((int*) response) = maybe_swap_endian_32(c->swap_byte_order, (ce->volume.values[0]*ESD_VOLUME_BASE)/PA_VOLUME_NORM); *((int*) response) = MAYBE_INT32_SWAP(c->swap_byte_order, (ce->volume.values[0]*ESD_VOLUME_BASE)/PA_VOLUME_NORM);
response += sizeof(int); response += sizeof(int);
/*format*/ /*format*/
*((int*) response) = maybe_swap_endian_32(c->swap_byte_order, format_native2esd(&ce->sample_spec)); *((int*) response) = MAYBE_INT32_SWAP(c->swap_byte_order, format_native2esd(&ce->sample_spec));
response += sizeof(int); response += sizeof(int);
/*length*/ /*length*/
*((int*) response) = maybe_swap_endian_32(c->swap_byte_order, (int) ce->memchunk.length); *((int*) response) = MAYBE_INT32_SWAP(c->swap_byte_order, (int) ce->memchunk.length);
response += sizeof(int); response += sizeof(int);
t -= s; t -= s;
@ -576,10 +577,10 @@ static int esd_proto_stream_pan(struct connection *c, PA_GCC_UNUSED esd_proto_t
struct connection *conn; struct connection *conn;
assert(c && data && length == sizeof(int)*3); assert(c && data && length == sizeof(int)*3);
idx = (uint32_t) maybe_swap_endian_32(c->swap_byte_order, *(const int*)data)-1; idx = MAYBE_UINT32_SWAP(c->swap_byte_order, *(const int*)data)-1;
lvolume = (uint32_t) maybe_swap_endian_32(c->swap_byte_order, *((const int*)data + 1)); lvolume = MAYBE_UINT32_SWAP(c->swap_byte_order, *((const int*)data + 1));
lvolume = (lvolume*PA_VOLUME_NORM)/ESD_VOLUME_BASE; lvolume = (lvolume*PA_VOLUME_NORM)/ESD_VOLUME_BASE;
rvolume = (uint32_t) maybe_swap_endian_32(c->swap_byte_order, *((const int*)data + 2)); rvolume = MAYBE_UINT32_SWAP(c->swap_byte_order, *((const int*)data + 2));
rvolume = (rvolume*PA_VOLUME_NORM)/ESD_VOLUME_BASE; rvolume = (rvolume*PA_VOLUME_NORM)/ESD_VOLUME_BASE;
ok = connection_write(c, sizeof(int)); ok = connection_write(c, sizeof(int));
@ -606,13 +607,13 @@ static int esd_proto_sample_cache(struct connection *c, PA_GCC_UNUSED esd_proto_
char name[ESD_NAME_MAX+sizeof(SCACHE_PREFIX)-1]; char name[ESD_NAME_MAX+sizeof(SCACHE_PREFIX)-1];
assert(c && data && length == (ESD_NAME_MAX+3*sizeof(int))); assert(c && data && length == (ESD_NAME_MAX+3*sizeof(int)));
format = maybe_swap_endian_32(c->swap_byte_order, *(const int*)data); format = MAYBE_INT32_SWAP(c->swap_byte_order, *(const int*)data);
rate = maybe_swap_endian_32(c->swap_byte_order, *((const int*)data + 1)); rate = MAYBE_INT32_SWAP(c->swap_byte_order, *((const int*)data + 1));
ss.rate = rate; ss.rate = rate;
format_esd2native(format, c->swap_byte_order, &ss); format_esd2native(format, c->swap_byte_order, &ss);
sc_length = (size_t) maybe_swap_endian_32(c->swap_byte_order, (*((const int*)data + 2))); sc_length = (size_t) MAYBE_INT32_SWAP(c->swap_byte_order, (*((const int*)data + 2)));
if (sc_length >= MAX_CACHE_SAMPLE_SIZE) if (sc_length >= MAX_CACHE_SAMPLE_SIZE)
return -1; return -1;
@ -668,7 +669,7 @@ static int esd_proto_sample_free_or_play(struct connection *c, esd_proto_t reque
uint32_t idx; uint32_t idx;
assert(c && data && length == sizeof(int)); assert(c && data && length == sizeof(int));
idx = (uint32_t) maybe_swap_endian_32(c->swap_byte_order, *(const int*)data)-1; idx = (uint32_t) MAYBE_INT32_SWAP(c->swap_byte_order, *(const int*)data)-1;
ok = connection_write(c, sizeof(int)); ok = connection_write(c, sizeof(int));
assert(ok); assert(ok);
@ -729,8 +730,7 @@ static int do_read(struct connection *c) {
if ((c->read_data_length+= r) >= sizeof(c->request)) { if ((c->read_data_length+= r) >= sizeof(c->request)) {
struct proto_handler *handler; struct proto_handler *handler;
if (c->swap_byte_order) c->request = MAYBE_INT32_SWAP(c->swap_byte_order, c->request);
c->request = swap_endian_32(c->request);
if (c->request < ESD_PROTO_CONNECT || c->request > ESD_PROTO_MAX) { if (c->request < ESD_PROTO_CONNECT || c->request > ESD_PROTO_MAX) {
pa_log(__FILE__": recieved invalid request.\n"); pa_log(__FILE__": recieved invalid request.\n");