Skip to content

Commit

Permalink
openbsd build: renaming byte order routines
Browse files Browse the repository at this point in the history
  • Loading branch information
@janbar
janbar committed Feb 15, 2024
1 parent 7a4054f commit f4b253a
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 94 deletions.
48 changes: 24 additions & 24 deletions noson/src/filepicreader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ FilePicReader::Picture * FilePicReader::ExtractFLACPicture(const std::string& fi
// get last block flag. if true next loop will stop
isLast = ((*buf & 0x80) != 0);
// get the current block size
unsigned v = (read32be(buf) & 0xffffff) - 4;
unsigned v = (read_b32be(buf) & 0xffffff) - 4;
if (v > MAX_PICTURE_SIZE)
break;

Expand All @@ -250,17 +250,17 @@ FilePicReader::Picture * FilePicReader::ExtractFLACPicture(const std::string& fi
{
DBG(DBG_PROTO, "%s: picture type (%.2x)\n", __FUNCTION__, buf[7]);
// check picture type matches with requirement
if (read32be(buf + 4) == pictureType || pictureType == -1)
if (read_b32be(buf + 4) == pictureType || pictureType == -1)
{
unsigned mime_type_len;
unsigned desc_len;
unsigned data_len;
char * picbuf = new char [v];
// read data block and check for sanity
if (fread(picbuf, 1, v, file) != v ||
(mime_type_len = read32be(picbuf)) > v - 4 ||
(desc_len = read32be(picbuf + 4 + mime_type_len)) > v - 8 - mime_type_len ||
(data_len = read32be(picbuf + mime_type_len + desc_len + 24)) > v - 28 - desc_len - mime_type_len)
(mime_type_len = read_b32be(picbuf)) > v - 4 ||
(desc_len = read_b32be(picbuf + 4 + mime_type_len)) > v - 8 - mime_type_len ||
(data_len = read_b32be(picbuf + mime_type_len + desc_len + 24)) > v - 28 - desc_len - mime_type_len)
{
delete [] picbuf;
break;
Expand Down Expand Up @@ -384,20 +384,20 @@ static inline void _parse_id3v2_frame_header(char * data, unsigned int version,
case 2:
memcpy(fh->frame_id, data, 3);
fh->frame_id[3] = 0;
fh->frame_size = (unsigned)read24be(data + 3);
fh->frame_size = (unsigned)read_b24be(data + 3);
fh->compression = 0;
fh->data_length_indicator = 0;
break;
case 3:
memcpy(fh->frame_id, data, 4);
fh->frame_size = (unsigned)read32be(data + 4);
fh->frame_size = (unsigned)read_b32be(data + 4);
fh->compression = data[9] & 0x40;
fh->data_length_indicator = 0;
break;
case 4:
default:
memcpy(fh->frame_id, data, 4);
fh->frame_size = (unsigned)read32be(data + 4);
fh->frame_size = (unsigned)read_b32be(data + 4);
fh->compression = data[9] & 0x4;
fh->data_length_indicator = data[9] & 0x1;
break;
Expand Down Expand Up @@ -671,7 +671,7 @@ int FilePicReader::parse_id3v2(FILE * file, long id3v2_offset, Picture ** pic, o
if (fread(extended_header_data, 1, 6, file) != 6)
return -1;

extended_header_size = (unsigned)read32be(extended_header_data);
extended_header_size = (unsigned)read_b32be(extended_header_data);

fseek(file, extended_header_size - 6, SEEK_CUR);
frame_data_pos += extended_header_size;
Expand Down Expand Up @@ -766,8 +766,8 @@ FilePicReader::Picture * FilePicReader::ExtractOGGSPicture(const std::string& fi
break;
}
//char stream_structure_version = read8(buf + 4);
unsigned char header_type_flag = (unsigned char)read8(buf + 5);
unsigned char number_page_segments = (unsigned char)read8(buf + 26);
unsigned char header_type_flag = (unsigned char)read_b8(buf + 5);
unsigned char number_page_segments = (unsigned char)read_b8(buf + 26);

uint32_t segment_table = 0;
if (fread(lacing, 1, number_page_segments, file) != number_page_segments)
Expand All @@ -777,7 +777,7 @@ FilePicReader::Picture * FilePicReader::ExtractOGGSPicture(const std::string& fi
}

for (int i = 0; i < number_page_segments; ++i)
segment_table += (unsigned char)read8(lacing + i);
segment_table += (unsigned char)read_b8(lacing + i);

// bit 0x04: this is the last page of a logical bitstream (eos)
if ((header_type_flag & 0x04) == 0x04)
Expand Down Expand Up @@ -828,7 +828,7 @@ FilePicReader::Picture * FilePicReader::ExtractOGGSPicture(const std::string& fi
}

// check for vorbis comment header
unsigned char block = (unsigned char)read8(packet.data);
unsigned char block = (unsigned char)read_b8(packet.data);
if (block == 0x03 && packet.datalen > 7 &&
memcmp(packet.data + 1, "vorbis", 6) == 0)
{
Expand Down Expand Up @@ -895,12 +895,12 @@ bool FilePicReader::parse_comment(packet_t * packet, Picture ** pic, PictureType
bool gotoLast = false;
unsigned char * ve = packet->data + packet->datalen;
unsigned char * vp = packet->data + 7; // pass magic string
vp += read32le(vp) + 4; // pass vendor string
int count = read32le(vp); // comment list length;
vp += read_b32le(vp) + 4; // pass vendor string
int count = read_b32le(vp); // comment list length;
vp += 4;
while (count > 0)
{
int len = read32le(vp);
int len = read_b32le(vp);
vp += 4;
if ((vp + len) > ve)
break; // buffer overflow
Expand All @@ -911,15 +911,15 @@ bool FilePicReader::parse_comment(packet_t * packet, Picture ** pic, PictureType
char * picbuf = nullptr;
size_t lenbuf = Base64::b64decode(vp + 23, len - 23, &picbuf);
// check picture type matches with requirement
if (lenbuf > 8 && (read32be(picbuf) == pictureType || pictureType == -1))
if (lenbuf > 8 && (read_b32be(picbuf) == pictureType || pictureType == -1))
{
unsigned mime_type_len;
unsigned desc_len;
unsigned data_len;
// check for sanity
if ((mime_type_len = read32be(picbuf + 4)) > lenbuf - 8 ||
(desc_len = read32be(picbuf + 8 + mime_type_len)) > lenbuf - 12 - mime_type_len ||
(data_len = read32be(picbuf + mime_type_len + desc_len + 28)) > lenbuf - 32 - desc_len - mime_type_len)
if ((mime_type_len = read_b32be(picbuf + 4)) > lenbuf - 8 ||
(desc_len = read_b32be(picbuf + 8 + mime_type_len)) > lenbuf - 12 - mime_type_len ||
(data_len = read_b32be(picbuf + mime_type_len + desc_len + 28)) > lenbuf - 32 - desc_len - mime_type_len)
{
delete [] picbuf;
break;
Expand Down Expand Up @@ -1015,15 +1015,15 @@ int FilePicReader::nextChild(unsigned char * buf, uint64_t * remaining, FILE * f
if (fread(buf, 1, M4A_HEADER_SIZE, fp) == M4A_HEADER_SIZE)
{
*remaining -= M4A_HEADER_SIZE;
*child = (unsigned)read32be(buf + 4);
*childSize = (uint32_t)read32be(buf);
*child = (unsigned)read_b32be(buf + 4);
*childSize = (uint32_t)read_b32be(buf);
if (*childSize == 1)
{
// size of 1 means the real size follows the header in next 8 bytes (64bits)
if (*remaining < 8 || fread(buf, 1, 8, fp) != 8)
return -1; // error
*remaining -= 8;
*childSize = (((uint64_t)read32be(buf) << 32) | (uint32_t)read32be(buf + 4)) - M4A_HEADER_SIZE - 8;
*childSize = (((uint64_t)read_b32be(buf) << 32) | (uint32_t)read_b32be(buf + 4)) - M4A_HEADER_SIZE - 8;
}
else
{
Expand Down Expand Up @@ -1054,7 +1054,7 @@ int FilePicReader::loadDataValue(uint64_t * remaining, FILE * fp, char ** alloc,
*remaining -= size;
*allocSize = size;
*alloc = _alloc;
return (read32be(_alloc) & 0x00ffffff); // return datatype
return (read_b32be(_alloc) & 0x00ffffff); // return datatype
}
return r;
}
Expand Down
6 changes: 3 additions & 3 deletions noson/src/flacencoder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,14 @@ int FLACEncoder::encode(const char * data, int len)
m_pcm[i] = (unsigned char)(*data) - 128;
break;
case 16:
m_pcm[i] = read16le(data);
m_pcm[i] = read_b16le(data);
break;
case 24:
m_pcm[i] = read24le(data);
m_pcm[i] = read_b24le(data);
break;
case 32:
// remove lower LSB
m_pcm[i] = (read32le(data) >> 8);
m_pcm[i] = (read_b32le(data) >> 8);
break;
default:
m_pcm[i] = 0;
Expand Down
2 changes: 1 addition & 1 deletion noson/src/private/byteorder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ static int test_endianess() {
return (*((char*)(&test))) ? LITTLE_ENDIAN : BIG_ENDIAN;
}

int __endianess__ = test_endianess();
int machine_bom = test_endianess();
48 changes: 24 additions & 24 deletions noson/src/private/byteorder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
#ifndef BYTE_ORDER
#define LITTLE_ENDIAN 1234
#define BIG_ENDIAN 4321
extern int __endianess__;
#define BYTE_ORDER __endianess__
extern int machine_bom;
#define BYTE_ORDER machine_bom
#endif
#define is_big_endian (BYTE_ORDER == BIG_ENDIAN)
#define is_little_endian (BYTE_ORDER == LITTLE_ENDIAN)
Expand All @@ -44,24 +44,24 @@ template <typename T> inline void toUnaligned(void * data, T val)
memcpy(data, &val, sizeof(T));
}

static inline int8_t read8(const void * data)
static inline int8_t read_b8(const void * data)
{
return fromUnaligned<int8_t>(data);
}

static inline void write8(void * data, int8_t val)
static inline void write_b8(void * data, int8_t val)
{
toUnaligned(data, val);
}

static inline int16_t swap16(int16_t val)
static inline int16_t swap_b16(int16_t val)
{
return (int16_t)(0 |
(((uint32_t)val & 0x00ff) << 8) |
(((uint32_t)val & 0xff00) >> 8));
}

static inline int32_t swap32(int32_t val)
static inline int32_t swap_b32(int32_t val)
{
return (int32_t)(0 |
(((uint32_t)val & 0x000000ff) << 24) |
Expand All @@ -71,39 +71,39 @@ static inline int32_t swap32(int32_t val)
);
}

static inline int16_t read16le(const void * data)
static inline int16_t read_b16le(const void * data)
{
int16_t val = fromUnaligned<int16_t>(data);
if (is_little_endian)
return val;
return swap16(val);
return swap_b16(val);
}

static inline void write16le(void * data, int16_t val)
static inline void write_b16le(void * data, int16_t val)
{
if (is_little_endian)
toUnaligned(data, val);
else
toUnaligned(data, swap16(val));
toUnaligned(data, swap_b16(val));
}

static inline int16_t read16be(const void * data)
static inline int16_t read_b16be(const void * data)
{
int16_t val = fromUnaligned<int16_t>(data);
if (is_big_endian)
return val;
return swap16(val);
return swap_b16(val);
}

static inline void write16be(void * data, int16_t val)
static inline void write_b16be(void * data, int16_t val)
{
if (is_big_endian)
toUnaligned(data, val);
else
toUnaligned(data, swap16(val));
toUnaligned(data, swap_b16(val));
}

static inline int32_t read24le(const void * data)
static inline int32_t read_b24le(const void * data)
{
const char * p = (const char*)data;
int32_t val = fromUnaligned<uint8_t>(&p[2]) << 16;
Expand All @@ -114,7 +114,7 @@ static inline int32_t read24le(const void * data)
return val;
}

static inline int32_t read24be(const void * data)
static inline int32_t read_b24be(const void * data)
{
const char * p = (const char*)data;
int32_t val = fromUnaligned<uint8_t>(&p[0]) << 16;
Expand All @@ -125,36 +125,36 @@ static inline int32_t read24be(const void * data)
return val;
}

static inline int32_t read32le(const void * data)
static inline int32_t read_b32le(const void * data)
{
int32_t val = fromUnaligned<int32_t>(data);
if (is_little_endian)
return val;
return swap32(val);
return swap_b32(val);
}

static inline void write32le(void * data, int32_t val)
static inline void write_b32le(void * data, int32_t val)
{
if (is_little_endian)
toUnaligned(data, val);
else
toUnaligned(data, swap32(val));
toUnaligned(data, swap_b32(val));
}

static inline int32_t read32be(const void * data)
static inline int32_t read_b32be(const void * data)
{
int32_t val = fromUnaligned<int32_t>(data);
if (is_big_endian)
return val;
return swap32(val);
return swap_b32(val);
}

static inline void write32be(void * data, int32_t val)
static inline void write_b32be(void * data, int32_t val)
{
if (is_big_endian)
toUnaligned(data, val);
else
toUnaligned(data, swap32(val));
toUnaligned(data, swap_b32(val));
}

#endif /* BYTEORDER_H */
Expand Down
Loading

0 comments on commit f4b253a

Please sign in to comment.