oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm/Dsd2Pcm: make variables more local

Browse Source
This commit is contained in:
Max Kellermann 2020-01-14 22:21:32 +01:00
parent b911ec1a29
commit e7483bc5bc
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pcm/Dsd2Pcm.cxx
View File

@ -151,8 +151,7 @@ static constexpr auto ctables = GenerateArray<CTABLES>(GenerateCtable);
void void
Dsd2Pcm::Reset() noexcept Dsd2Pcm::Reset() noexcept
{ {
int i; for (int i = 0; i < FIFOSIZE; ++i)
for (i=0; i<FIFOSIZE; ++i)
fifo[i] = 0x69; /* my favorite silence pattern */ fifo[i] = 0x69; /* my favorite silence pattern */
fifopos = 0; fifopos = 0;
/* 0x69 = 01101001 /* 0x69 = 01101001
@ -168,22 +167,17 @@ Dsd2Pcm::Translate(size_t samples,
bool lsbf, bool lsbf,
float *dst, ptrdiff_t dst_stride) noexcept float *dst, ptrdiff_t dst_stride) noexcept
{ {
unsigned ffp; unsigned ffp = fifopos;
unsigned i;
unsigned bite1, bite2;
unsigned char* p;
double acc;
ffp = fifopos;
while (samples-- > 0) { while (samples-- > 0) {
bite1 = *src & 0xFFu; unsigned bite1 = *src & 0xFFu;
if (lsbf) bite1 = bit_reverse(bite1); if (lsbf) bite1 = bit_reverse(bite1);
fifo[ffp] = bite1; src += src_stride; fifo[ffp] = bite1; src += src_stride;
p = fifo + ((ffp-CTABLES) & FIFOMASK); unsigned char *p = fifo + ((ffp-CTABLES) & FIFOMASK);
*p = bit_reverse(*p); *p = bit_reverse(*p);
acc = 0; double acc = 0;
for (i=0; i<CTABLES; ++i) { for (unsigned i = 0; i < CTABLES; ++i) {
bite1 = fifo[(ffp -i) & FIFOMASK] & 0xFF; bite1 = fifo[(ffp -i) & FIFOMASK] & 0xFF;
bite2 = fifo[(ffp-(CTABLES*2-1)+i) & FIFOMASK] & 0xFF; unsigned bite2 = fifo[(ffp-(CTABLES*2-1)+i) & FIFOMASK] & 0xFF;
acc += ctables[i][bite1] + ctables[i][bite2]; acc += ctables[i][bite1] + ctables[i][bite2];
} }
*dst = (float)acc; dst += dst_stride; *dst = (float)acc; dst += dst_stride;