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

[FFmpeg Input] Buffer up to 5ms each read call 

Buffer up to 5 milliseconds of audio, or at minimum 1024 samples, each
call. Also pre-allocate the buffer, rather than using a stack buffer.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
xcode15
Christopher Snowhill 2022-07-21 04:03:21 -07:00
parent 28d5849505
commit e14c630034
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/FFMPEG/FFMPEGDecoder.h
View File

@ -43,6 +43,9 @@ int64_t ffmpeg_seek(void *opaque, int64_t offset, int whence);
AVFrame *lastDecodedFrame; AVFrame *lastDecodedFrame;
AVPacket *lastReadPacket; AVPacket *lastReadPacket;
int sampleBufferSize;
uint8_t *sampleBuffer;
int metadataUpdateInterval; int metadataUpdateInterval;
int metadataUpdateCount; int metadataUpdateCount;

22
Plugins/FFMPEG/FFMPEGDecoder.m
View File

@ -435,6 +435,14 @@ static uint8_t reverse_bits[0x100];
endOfStream = NO; endOfStream = NO;
endOfAudio = NO; endOfAudio = NO;
sampleBufferSize = MAX(codecCtx->sample_rate / 200, 1024); // Minimum 1024 samples, or maximum 5 milliseconds
sampleBufferSize *= rawDSD ? channels : channels * (bitsPerSample / 8);
sampleBuffer = av_malloc(sampleBufferSize);
if(!sampleBuffer) {
ALog(@"Out of memory!");
return NO;
}
metadataUpdateInterval = codecCtx->sample_rate; metadataUpdateInterval = codecCtx->sample_rate;
metadataUpdateCount = 0; metadataUpdateCount = 0;
@ -512,6 +520,11 @@ static uint8_t reverse_bits[0x100];
ioCtx = NULL; ioCtx = NULL;
} }
if(sampleBuffer) {
av_free(sampleBuffer);
sampleBuffer = NULL;
}
if(buffer) { if(buffer) {
av_free(buffer); av_free(buffer);
buffer = NULL; buffer = NULL;
@ -696,14 +709,11 @@ static void setDictionary(NSMutableDictionary *dict, NSString *tag, NSString *va
if(totalFrames && framesRead >= totalFrames) if(totalFrames && framesRead >= totalFrames)
return nil; return nil;
int frames = 1024;
int frameSize = rawDSD ? channels : channels * (bitsPerSample / 8); int frameSize = rawDSD ? channels : channels * (bitsPerSample / 8);
int bytesToRead = frames * frameSize; int bytesToRead = sampleBufferSize;
int bytesRead = 0; int bytesRead = 0;
uint8_t buffer[bytesToRead]; void *buf = (void *)sampleBuffer;
void *buf = (void *)buffer;
int dataSize = 0; int dataSize = 0;
@ -914,7 +924,7 @@ static void setDictionary(NSMutableDictionary *dict, NSString *tag, NSString *va
id audioChunkClass = NSClassFromString(@"AudioChunk"); id audioChunkClass = NSClassFromString(@"AudioChunk");
AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]]; AudioChunk *chunk = [[audioChunkClass alloc] initWithProperties:[self properties]];
[chunk assignSamples:buffer frameCount:framesReadNow]; [chunk assignSamples:sampleBuffer frameCount:framesReadNow];
return chunk; return chunk;
} }