kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix DSD gaplessness handling 

DSD files should be properly gapless now.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
CQTexperiment
Christopher Snowhill 2022-02-15 02:03:06 -08:00
parent 570e28403e
commit 4b0f6b381f
2 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Audio/Chain/ConverterNode.h
View File

@ -57,7 +57,6 @@
void **dsd2pcm; void **dsd2pcm;
size_t dsd2pcmCount; size_t dsd2pcmCount;
int dsd2pcmLatency; int dsd2pcmLatency;
int dsdLatencyEaten;
BOOL rememberedLossless; BOOL rememberedLossless;

33
Audio/Chain/ConverterNode.m
View File

@ -429,7 +429,6 @@ static void convert_be_to_le(uint8_t *buffer, size_t bitsPerSample, size_t bytes
UInt32 ioNumberPackets; UInt32 ioNumberPackets;
int amountReadFromFC; int amountReadFromFC;
int amountRead = 0; int amountRead = 0;
int amountToSkip;
int amountToIgnorePostExtrapolated = 0; int amountToIgnorePostExtrapolated = 0;
if(stopping) if(stopping)
@ -462,18 +461,11 @@ tryagain:
ioNumberPackets = ((uint32_t)(ioNumberPackets / sampleRatio) + 15) & ~15; ioNumberPackets = ((uint32_t)(ioNumberPackets / sampleRatio) + 15) & ~15;
} }
amountToSkip = 0;
if(dsd2pcm && !is_preextrapolated_) {
amountToSkip = dsd2pcmLatency * inputFormat.mBytesPerPacket;
ioNumberPackets += dsd2pcmLatency;
}
size_t newSize = ioNumberPackets * floatFormat.mBytesPerPacket; size_t newSize = ioNumberPackets * floatFormat.mBytesPerPacket;
if(!inputBuffer || inputBufferSize < newSize) if(!inputBuffer || inputBufferSize < newSize)
inputBuffer = realloc(inputBuffer, inputBufferSize = newSize * 3); inputBuffer = realloc(inputBuffer, inputBufferSize = newSize * 3);
ssize_t amountToWrite = ioNumberPackets * inputFormat.mBytesPerPacket; ssize_t amountToWrite = ioNumberPackets * inputFormat.mBytesPerPacket;
amountToWrite -= amountToSkip;
ssize_t bytesReadFromInput = 0; ssize_t bytesReadFromInput = 0;
@ -501,7 +493,7 @@ tryagain:
size_t bytesRead = frameCount * inf.mBytesPerPacket; size_t bytesRead = frameCount * inf.mBytesPerPacket;
if(frameCount) { if(frameCount) {
NSData *samples = [chunk removeSamples:frameCount]; NSData *samples = [chunk removeSamples:frameCount];
memcpy(inputBuffer + bytesReadFromInput + amountToSkip, [samples bytes], bytesRead); memcpy(inputBuffer + bytesReadFromInput, [samples bytes], bytesRead);
lastChunkIn = [[AudioChunk alloc] init]; lastChunkIn = [[AudioChunk alloc] init];
[lastChunkIn setFormat:inf]; [lastChunkIn setFormat:inf];
[lastChunkIn setChannelConfig:config]; [lastChunkIn setChannelConfig:config];
@ -519,10 +511,9 @@ tryagain:
if(stopping || paused || streamFormatChanged || [self shouldContinue] == NO || [self endOfStream] == YES) { if(stopping || paused || streamFormatChanged || [self shouldContinue] == NO || [self endOfStream] == YES) {
if(!skipResampler && !is_postextrapolated_) { if(!skipResampler && !is_postextrapolated_) {
if(dsd2pcm) { if(dsd2pcm) {
amountToSkip = dsd2pcmLatency * inputFormat.mBytesPerPacket; uint32_t amountToSkip = dsd2pcmLatency * inputFormat.mBytesPerPacket;
memset(inputBuffer + bytesReadFromInput, 0x55, amountToSkip); memset(inputBuffer + bytesReadFromInput, 0x55, amountToSkip);
bytesReadFromInput += amountToSkip; bytesReadFromInput += amountToSkip;
amountToSkip = 0;
} }
is_postextrapolated_ = 1; is_postextrapolated_ = 1;
} else if(!is_postextrapolated_ && dsd2pcm) { } else if(!is_postextrapolated_ && dsd2pcm) {
@ -545,7 +536,6 @@ tryagain:
memcpy(inputBuffer, [samples bytes], bytesRead); memcpy(inputBuffer, [samples bytes], bytesRead);
} }
bytesReadFromInput += bytesRead; bytesReadFromInput += bytesRead;
amountToSkip = 0;
} }
if(!bytesReadFromInput) { if(!bytesReadFromInput) {
@ -553,13 +543,6 @@ tryagain:
return amountRead; return amountRead;
} }
bytesReadFromInput += amountToSkip;
if(dsd2pcm && amountToSkip) {
memset(inputBuffer, 0x55, amountToSkip);
dsdLatencyEaten = (int)ceil(dsd2pcmLatency * sampleRatio);
}
if(bytesReadFromInput && isBigEndian) { if(bytesReadFromInput && isBigEndian) {
// Time for endian swap! // Time for endian swap!
convert_be_to_le(inputBuffer, inputFormat.mBitsPerChannel, bytesReadFromInput); convert_be_to_le(inputBuffer, inputFormat.mBitsPerChannel, bytesReadFromInput);
@ -670,7 +653,7 @@ tryagain:
lpc_extrapolate_bkwd(inputBuffer + N_samples_to_add_ * floatFormat.mBytesPerPacket, samples_in_buffer, prime, floatFormat.mChannelsPerFrame, LPC_ORDER, N_samples_to_add_, &extrapolateBuffer, &extrapolateBufferSize); lpc_extrapolate_bkwd(inputBuffer + N_samples_to_add_ * floatFormat.mBytesPerPacket, samples_in_buffer, prime, floatFormat.mChannelsPerFrame, LPC_ORDER, N_samples_to_add_, &extrapolateBuffer, &extrapolateBufferSize);
bytesReadFromInput += N_samples_to_add_ * floatFormat.mBytesPerPacket; bytesReadFromInput += N_samples_to_add_ * floatFormat.mBytesPerPacket;
latencyEaten = N_samples_to_drop_; latencyEaten = N_samples_to_drop_;
if(dsd2pcm) latencyEaten += dsdLatencyEaten; if(dsd2pcm) latencyEaten += (int)ceil(dsd2pcmLatency * sampleRatio);
is_preextrapolated_ = 2; is_preextrapolated_ = 2;
} else if(dsd2pcm && !is_preextrapolated_) { } else if(dsd2pcm && !is_preextrapolated_) {
latencyEaten = dsd2pcmLatency; latencyEaten = dsd2pcmLatency;
@ -693,19 +676,9 @@ tryagain:
inputBuffer = realloc(inputBuffer, inputBufferSize = newSize * 3); inputBuffer = realloc(inputBuffer, inputBufferSize = newSize * 3);
} }
// And now that we've reached the end, we eat slightly less, due to the filter size
int samplesLatency = 0;
if(dsd2pcm) samplesLatency += dsd2pcmLatency;
samplesLatency = (int)ceil(samplesLatency * sampleRatio);
lpc_extrapolate_fwd(inputBuffer, samples_in_buffer, prime, floatFormat.mChannelsPerFrame, LPC_ORDER, N_samples_to_add_, &extrapolateBuffer, &extrapolateBufferSize); lpc_extrapolate_fwd(inputBuffer, samples_in_buffer, prime, floatFormat.mChannelsPerFrame, LPC_ORDER, N_samples_to_add_, &extrapolateBuffer, &extrapolateBufferSize);
bytesReadFromInput += N_samples_to_add_ * floatFormat.mBytesPerPacket; bytesReadFromInput += N_samples_to_add_ * floatFormat.mBytesPerPacket;
latencyEatenPost = N_samples_to_drop_; latencyEatenPost = N_samples_to_drop_;
if(latencyEatenPost > samplesLatency) {
latencyEatenPost -= samplesLatency;
} else {
latencyEatenPost = 0;
}
is_postextrapolated_ = 2; is_postextrapolated_ = 2;
} else if(is_postextrapolated_ == 3) { // skip end of DSD output } else if(is_postextrapolated_ == 3) { // skip end of DSD output
latencyEatenPost = dsd2pcmLatency; latencyEatenPost = dsd2pcmLatency;