diff options
| -rw-r--r-- | sbc/sbc.c | 22 |
1 files changed, 15 insertions, 7 deletions
@@ -1137,6 +1137,10 @@ static int sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len) } } + /* this is temporary until we use an in-place shift above */ + if(produced % 8) + data[produced >> 3] >>= 8 - (produced % 8); + data[3] = sbc_crc8(crc_header, crc_pos); sbc_calculate_bits(frame, bits, sf); @@ -1154,20 +1158,24 @@ static int sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len) (uint16_t) ((((frame->sb_sample_f[blk][ch][sb]*levels[ch][sb]) >> (frame->scale_factor[ch][sb] + 1)) + levels[ch][sb]) >> 1); + audio_sample <<= 16 - bits[ch][sb]; for (bit = 0; bit < bits[ch][sb]; bit++) { - int b; /* A bit */ - if (produced % 8 == 0) - data[produced >> 3] = 0; - b = ((audio_sample) >> - (bits[ch][sb] - bit - 1)) & 0x01; - data[produced >> 3] |= b << (7 - (produced % 8)); + data[produced >> 3] <<= 1; + if(audio_sample & 0x8000) + data[produced >> 3] |= 0x1; + audio_sample <<= 1; produced++; } } } } } - + + /* align the last byte */ + if(produced % 8) { + data[produced >> 3] <<= 8 - (produced % 8); + } + return (produced + 7) >> 3; } |