Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-21 12:51:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
bnnm 2020-07-31 16:44:31 +02:00
parent d900718a5b
commit 3901393aa3
2 changed files with 53 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/coding/vorbis_bitreader.h
View File

@ -39,8 +39,7 @@ static int rv_bits(bitstream_t* ib, uint32_t bits, uint32_t* value) {
shift = ib->b_off % 8; /* bit sub-offset */
mask = MASK_TABLE[bits]; /* to remove upper in highest byte */
val = 0;
val |= ib->buf[pos+0] >> shift;
val = ib->buf[pos+0] >> shift;
if (bits + shift > 8) {
val |= ib->buf[pos+1] << (8u - shift);
if (bits + shift > 16) {
@ -48,8 +47,7 @@ static int rv_bits(bitstream_t* ib, uint32_t bits, uint32_t* value) {
if (bits + shift > 24) {
val |= ib->buf[pos+3] << (24u - shift);
if (bits + shift > 32) {
/* upper bits are lost (shifting over 32) */
val |= ib->buf[pos+4] << (32u - shift);
val |= ib->buf[pos+4] << (32u - shift); /* upper bits are lost (shifting over 32) */
}
}
}
@ -66,6 +64,7 @@ fail:
return 0;
}
#ifndef BITSTREAM_READ_ONLY
/* Write bits (max 32) to buf and update the bit offset. Vorbis packs values in LSB order and byte by byte.
* (ex. writing 1101011010 from b_off 2 we get 01101011 00001101 (value split, and 11 in the first byte skipped)*/
static int wv_bits(bitstream_t* ob, uint32_t bits, uint32_t value) {
@ -99,37 +98,6 @@ fail:
VGM_LOG("BITREADER: write fail\n");
return 0;
}
static int copy_bytes(bitstream_t* ob, bitstream_t* ib, uint32_t bytes) {
int i;
/* copy packet bytes, where input/output bufs may not be byte-aligned (so non memcpy) */
for (i = 0; i < bytes / 4; i++) {
uint32_t c = 0;
rv_bits(ib, 32, &c);
wv_bits(ob, 32, c);
}
for (i = 0; i < bytes % 4; i++) {
uint32_t c = 0;
rv_bits(ib, 8, &c);
wv_bits(ob, 8, c);
}
#if 0
/* in theory the above is faster, but only seems minimally noticeable when converting lots of files */
for (i = 0; i < bytes; i++) {
uint32_t c = 0;
rv_bits(ib, 8, &c);
wv_bits(ob, 8, c);
}
#endif
return 1;
}
#endif

52
src/coding/vorbis_custom_utils_wwise.c
View File

@ -291,6 +291,54 @@ static size_t build_header_comment(uint8_t* buf, size_t bufsize) {
return bytes;
}
/* copy packet bytes, where input/output bufs may not be byte-aligned (so no memcpy) */
static int copy_bytes(bitstream_t* ob, bitstream_t* ib, uint32_t bytes) {
int i;
#if 0
/* in theory this would be faster, but not clear results; maybe default is just optimized by compiler */
for (i = 0; i < bytes / 4; i++) {
uint32_t c = 0;
rv_bits(ib, 32, &c);
wv_bits(ob, 32, c);
}
for (i = 0; i < bytes % 4; i++) {
uint32_t c = 0;
rv_bits(ib, 8, &c);
wv_bits(ob, 8, c);
}
#endif
#if 0
/* output bits are never(?) byte aligned but input always is, yet this doesn't seem any faster */
if (ib->b_off % 8 == 0) {
int iw_pos = ib->b_off / 8;
for (i = 0; i < bytes; i++, iw_pos++) {
uint32_t c = ib->buf[iw_pos];
//rv_bits(ib, 8, &c);
wv_bits(ob, 8, c);
}
ib->b_off += bytes * 8;
return 1;
}
#endif
for (i = 0; i < bytes; i++) {
uint32_t c = 0;
rv_bits(ib, 8, &c);
wv_bits(ob, 8, c);
}
return 1;
}
/* **************************************************************************** */
/* INTERNAL WW2OGG STUFF */
/* **************************************************************************** */
@ -302,7 +350,7 @@ static size_t build_header_comment(uint8_t* buf, size_t bufsize) {
* Reads/writes unsigned ints as most are bit values less than 32 and with no sign meaning.
*/
/* Copy packet as-is or rebuild first byte if mod_packets is used.
/* Copy packet as-is or rebuild to standard Vorbis packet if mod_packets is used.
* (ref: https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-720004.3) */
static int ww2ogg_generate_vorbis_packet(bitstream_t* ow, bitstream_t* iw, wpacket_t* wp, vorbis_custom_codec_data* data) {
@ -326,12 +374,12 @@ static int ww2ogg_generate_vorbis_packet(bitstream_t* ow, bitstream_t* iw, wpack
/* collect this packet mode from the first byte */
rv_bits(iw, data->mode_bits,&mode_number); /* max 6b */
wv_bits(ow, data->mode_bits, mode_number);
rv_bits(iw, 8-data->mode_bits,&remainder);
/* adjust window info */
if (data->mode_blockflag[mode_number]) {
/* long window: peek at next frame to find flags */
//off_t next_offset = offset + header_size + packet_size;
uint32_t next_blockflag = 0, prev_window_type = 0, next_window_type = 0;
if (wp->has_next) {