summaryrefslogtreecommitdiff
path: root/src/combined
diff options
context:
space:
mode:
Diffstat (limited to 'src/combined')
-rw-r--r--src/combined/nsf_decoder.c2
-rw-r--r--src/combined/xine_ogg_demuxer.c56
2 files changed, 29 insertions, 29 deletions
diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c
index 01884f267..b1d8e706c 100644
--- a/src/combined/nsf_decoder.c
+++ b/src/combined/nsf_decoder.c
@@ -93,7 +93,7 @@ static void nsf_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
this->song_number = buf->content[4];
/* allocate a buffer for the file */
- this->nsf_size = BE_32(&buf->content[0]);
+ this->nsf_size = _X_BE_32(&buf->content[0]);
this->nsf_file = xine_xmalloc(this->nsf_size);
this->nsf_index = 0;
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
index 56234723d..85402484e 100644
--- a/src/combined/xine_ogg_demuxer.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -871,14 +871,14 @@ static void decode_video_header (demux_ogg_t *this, const int stream_num, ogg_pa
locsubtype = *((uint32_t *)&op->packet[9]);
/* everything else little endian */
- locsize = LE_32(&op->packet[13]);
- loctime_unit = LE_64(&op->packet[17]);
- locsamples_per_unit = LE_64(&op->packet[25]);
- locdefault_len = LE_32(&op->packet[33]);
- locbuffersize = LE_32(&op->packet[37]);
- locbits_per_sample = LE_16(&op->packet[41]);
- locwidth = LE_32(&op->packet[45]);
- locheight = LE_32(&op->packet[49]);
+ locsize = _X_LE_32(&op->packet[13]);
+ loctime_unit = _X_LE_64(&op->packet[17]);
+ locsamples_per_unit = _X_LE_64(&op->packet[25]);
+ locdefault_len = _X_LE_32(&op->packet[33]);
+ locbuffersize = _X_LE_32(&op->packet[37]);
+ locbits_per_sample = _X_LE_16(&op->packet[41]);
+ locwidth = _X_LE_32(&op->packet[45]);
+ locheight = _X_LE_32(&op->packet[49]);
lprintf ("direct show filter created stream detected, hexdump:\n");
#ifdef LOG
@@ -949,15 +949,15 @@ static void decode_audio_header (demux_ogg_t *this, const int stream_num, ogg_pa
int32_t locsize, locdefault_len, locbuffersize, locavgbytespersec;
int64_t loctime_unit, locsamples_per_unit;
- locsize = LE_32(&op->packet[13]);
- loctime_unit = LE_64(&op->packet[17]);
- locsamples_per_unit = LE_64(&op->packet[25]);
- locdefault_len = LE_32(&op->packet[33]);
- locbuffersize = LE_32(&op->packet[37]);
- locbits_per_sample = LE_16(&op->packet[41]);
- locchannels = LE_16(&op->packet[45]);
- locblockalign = LE_16(&op->packet[47]);
- locavgbytespersec= LE_32(&op->packet[49]);
+ locsize = _X_LE_32(&op->packet[13]);
+ loctime_unit = _X_LE_64(&op->packet[17]);
+ locsamples_per_unit = _X_LE_64(&op->packet[25]);
+ locdefault_len = _X_LE_32(&op->packet[33]);
+ locbuffersize = _X_LE_32(&op->packet[37]);
+ locbits_per_sample = _X_LE_16(&op->packet[41]);
+ locchannels = _X_LE_16(&op->packet[45]);
+ locblockalign = _X_LE_16(&op->packet[47]);
+ locavgbytespersec= _X_LE_32(&op->packet[49]);
lprintf ("direct show filter created audio stream detected, hexdump:\n");
#ifdef LOG
@@ -1026,7 +1026,7 @@ static void decode_dshow_header (demux_ogg_t *this, const int stream_num, ogg_pa
this->si[stream_num]->headers = 0; /* header is sent below */
- if ( (LE_32(&op->packet[96]) == 0x05589f80) && (op->bytes >= 184)) {
+ if ( (_X_LE_32(&op->packet[96]) == 0x05589f80) && (op->bytes >= 184)) {
buf_element_t *buf;
xine_bmiheader bih;
@@ -1045,11 +1045,11 @@ static void decode_dshow_header (demux_ogg_t *this, const int stream_num, ogg_pa
this->si[stream_num]->buf_types |= channel;
bih.biSize = sizeof(xine_bmiheader);
- bih.biWidth = LE_32(&op->packet[176]);
- bih.biHeight = LE_32(&op->packet[180]);
+ bih.biWidth = _X_LE_32(&op->packet[176]);
+ bih.biHeight = _X_LE_32(&op->packet[180]);
bih.biPlanes = 0;
memcpy (&bih.biCompression, op->packet+68, 4);
- bih.biBitCount = LE_16(&op->packet[182]);
+ bih.biBitCount = _X_LE_16(&op->packet[182]);
if (!bih.biBitCount)
bih.biBitCount = 24; /* FIXME ? */
bih.biSizeImage = (bih.biBitCount>>3)*bih.biWidth*bih.biHeight;
@@ -1085,7 +1085,7 @@ static void decode_dshow_header (demux_ogg_t *this, const int stream_num, ogg_pa
this->ignore_keyframes = 1;
- } else if (LE_32(&op->packet[96]) == 0x05589F81) {
+ } else if (_X_LE_32(&op->packet[96]) == 0x05589F81) {
#if 0
/* FIXME: no test streams */
@@ -1215,7 +1215,7 @@ static void decode_flac_header (demux_ogg_t *this, const int stream_num, ogg_pac
_x_assert(op->packet[5] == 1); _x_assert(op->packet[6] == 0);
/* Header count */
- this->si[stream_num]->headers = 0/*BE_16(&op->packet[7]) +1*/;
+ this->si[stream_num]->headers = 0/*_X_BE_16(&op->packet[7]) +1*/;
/* fLaC signature */
_x_assert(op->packet[9] == 'f'); _x_assert(op->packet[10] == 'L');
@@ -1278,9 +1278,9 @@ static void decode_anxdata_header (demux_ogg_t *this, const int stream_num, ogg_
lprintf("AnxData stream detected\n");
/* read granule rate */
- granule_rate_n = LE_64(&op->packet[8]);
- granule_rate_d = LE_64(&op->packet[16]);
- secondary_headers = LE_32(&op->packet[24]);
+ granule_rate_n = _X_LE_64(&op->packet[8]);
+ granule_rate_d = _X_LE_64(&op->packet[16]);
+ secondary_headers = _X_LE_32(&op->packet[24]);
lprintf("granule_rate %" PRId64 "/%" PRId64 ", %d secondary headers\n",
granule_rate_n, granule_rate_d, secondary_headers);
@@ -1340,8 +1340,8 @@ static void decode_cmml_header (demux_ogg_t *this, const int stream_num, ogg_pac
this->si[stream_num]->headers = 0;
this->si[stream_num]->buf_types = BUF_SPU_CMML | channel;
- this->si[stream_num]->factor = 90000 * LE_64(&op->packet[20]);
- this->si[stream_num]->quotient = LE_64(&op->packet[12]);
+ this->si[stream_num]->factor = 90000 * _X_LE_64(&op->packet[20]);
+ this->si[stream_num]->quotient = _X_LE_64(&op->packet[12]);
this->si[stream_num]->granuleshift = (int)op->packet[28];
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-29 05:34:33 +0000