chris/Cog
2
1
Fork 0
Code Issues 64 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: chris:fc2a14b0fad0c071c8ce59450d3e6fff10a2df8c
Branches Tags
chris:main
chris:wip.tahoe
chris:sparkle
chris:emusc
chris:projectm
chris:update-vgmstream
chris:xcode15
chris:lastfm
chris:swiftingly
chris:CQTexperiment
chris:k54
chris:r516
..
compare: chris:6e8538c7c979bb133ebac1fdb8ac4672365bcc28
Branches Tags
chris:wip.tahoe
chris:main
chris:sparkle
chris:emusc
chris:projectm
chris:update-vgmstream
chris:xcode15
chris:lastfm
chris:swiftingly
chris:CQTexperiment
chris:k54
chris:r516

No commits in common. "fc2a14b0fad0c071c8ce59450d3e6fff10a2df8c" and "6e8538c7c979bb133ebac1fdb8ac4672365bcc28" have entirely different histories.
fc2a14b0fa ... 6e8538c7c9

2 changed files with 11 additions and 17 deletions
Show stats Expand all files Collapse all files

5
Plugins/minimp3/MP3Decoder.h
View file

@ -15,11 +15,12 @@
#import "Plugin.h"
#define INPUT_BUFFER_SIZE 16 * 1024
#define INPUT_BUFFER_SIZE 5 * 8192
@interface MP3Decoder : NSObject <CogDecoder> {
BOOL seekable;
unsigned char _decoder_buffer[INPUT_BUFFER_SIZE];
mp3dec_t _decoder;
unsigned char _decoder_buffer[32768];
size_t _decoder_buffer_filled;
mp3dec_ex_t _decoder_ex;

23
Plugins/minimp3/MP3Decoder.m
View file

@ -38,8 +38,6 @@ static int mp3_seek_callback(uint64_t position, void *user_data) {
size_t id3_length = 0;
if(seekable) {
// minimp3 already skips ID3v2, but we need to supplement it with support for
// iTunes gapless info, which is stored in the ID3v2 tag
uint8_t buffer[10];
size_t buflen = [source read:&buffer[0] amount:10];
@ -139,14 +137,12 @@ static int mp3_seek_callback(uint64_t position, void *user_data) {
if(error)
return NO;
if(_foundiTunSMPB) {
// start_delay is used for seeking, to_skip must be filled for the first packet decoded
// and detected_samples will truncate the end padding
_decoder_ex.start_delay = _decoder_ex.to_skip = _startPadding * _decoder_ex.info.channels;
_decoder_ex.detected_samples = totalFrames * _decoder_ex.info.channels;
_decoder_ex.samples = (totalFrames + _startPadding + _endPadding) * _decoder_ex.info.channels;
}
mp3d_sample_t *sample_ptr = NULL;
size_t samples = mp3dec_ex_read_frame(&_decoder_ex, &sample_ptr, &_decoder_info, MINIMP3_MAX_SAMPLES_PER_FRAME);
size_t samples = mp3dec_ex_read_frame(&_decoder_ex, &sample_ptr, &_decoder_info, 1152 * 2);
if(samples && sample_ptr) {
samples_filled = samples / _decoder_info.channels;
memcpy(&_decoder_buffer_output[0], sample_ptr, sizeof(mp3d_sample_t) * samples);
@ -161,10 +157,10 @@ static int mp3_seek_callback(uint64_t position, void *user_data) {
}
bitrate = (double)((_fileSize - id3_length) * 8) / ((double)totalFrames / (double)_decoder_info.hz) / 1000.0;
} else {
_decoder_buffer_filled = [source read:_decoder_buffer amount:INPUT_BUFFER_SIZE];
inputEOF = _decoder_buffer_filled < INPUT_BUFFER_SIZE;
mp3dec_init(&_decoder_ex.mp3d);
int samples = mp3dec_decode_frame(&_decoder_ex.mp3d, _decoder_buffer, (int)_decoder_buffer_filled, &_decoder_buffer_output[0], &_decoder_info);
_decoder_buffer_filled = [source read:_decoder_buffer amount:32768];
inputEOF = _decoder_buffer_filled < 32768;
mp3dec_init(&_decoder);
int samples = mp3dec_decode_frame(&_decoder, _decoder_buffer, (int)_decoder_buffer_filled, &_decoder_buffer_output[0], &_decoder_info);
if(!samples)
return NO;
size_t bytes_read = _decoder_info.frame_bytes;
@ -235,7 +231,7 @@ static int mp3_seek_callback(uint64_t position, void *user_data) {
if(seekable) {
mp3d_sample_t *sample_ptr = NULL;
size_t samples = mp3dec_ex_read_frame(&_decoder_ex, &sample_ptr, &_decoder_info, MINIMP3_MAX_SAMPLES_PER_FRAME);
size_t samples = mp3dec_ex_read_frame(&_decoder_ex, &sample_ptr, &_decoder_info, 1152 * 2);
if(samples && sample_ptr) {
samples_filled = samples / _decoder_info.channels;
memcpy(&_decoder_buffer_output[0], sample_ptr, sizeof(mp3d_sample_t) * samples);
@ -243,7 +239,7 @@ static int mp3_seek_callback(uint64_t position, void *user_data) {
inputEOF = YES;
}
} else {
size_t bytesRemain = INPUT_BUFFER_SIZE - _decoder_buffer_filled;
size_t bytesRemain = 32768 - _decoder_buffer_filled;
ssize_t bytesRead = [_source read:&_decoder_buffer[_decoder_buffer_filled] amount:bytesRemain];
if(bytesRead < 0 || bytesRead < bytesRemain) {
inputEOF = YES;
@ -251,7 +247,7 @@ static int mp3_seek_callback(uint64_t position, void *user_data) {
if(bytesRead > 0) {
_decoder_buffer_filled += bytesRead;
}
int samples = mp3dec_decode_frame(&_decoder_ex.mp3d, &_decoder_buffer[0], (int)_decoder_buffer_filled, &_decoder_buffer_output[0], &_decoder_info);
int samples = mp3dec_decode_frame(&_decoder, &_decoder_buffer[0], (int)_decoder_buffer_filled, &_decoder_buffer_output[0], &_decoder_info);
if(samples > 0) {
samples_filled = samples;
} else {
@ -276,9 +272,6 @@ static int mp3_seek_callback(uint64_t position, void *user_data) {
}
- (void)close {
if(seekable) {
mp3dec_ex_close(&_decoder_ex);
}
if(_source) {
_source = nil;
}