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

Fixed several bugs with decoding audio

CQTexperiment
Chris Moeller 2013-10-10 21:52:32 -07:00
parent 4aab503658
commit fd9d9a7065
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Plugins/FFMPEG/FFMPEGDecoder.m
View File

@ -112,7 +112,7 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op)
lastReadPacket = malloc(sizeof(AVPacket)); lastReadPacket = malloc(sizeof(AVPacket));
av_new_packet(lastReadPacket, 0); av_new_packet(lastReadPacket, 0);
readNextPacket = YES; readNextPacket = YES;
bytesConsumedFromDecodedFrame = 0; bytesConsumedFromDecodedFrame = INT_MAX;
frequency = codecCtx->sample_rate; frequency = codecCtx->sample_rate;
channels = codecCtx->channels; channels = codecCtx->channels;
@ -229,7 +229,7 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op)
else else
{ {
// Something has been successfully decoded // Something has been successfully decoded
dataSize = av_samples_get_buffer_size(NULL, codecCtx->channels, dataSize = av_samples_get_buffer_size(&planeSize, codecCtx->channels,
lastDecodedFrame->nb_samples, lastDecodedFrame->nb_samples,
codecCtx->sample_fmt, 1); codecCtx->sample_fmt, 1);
bytesReadFromPacket += len; bytesReadFromPacket += len;
@ -240,7 +240,11 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op)
// decoding consumed all the read packet - read another next time // decoding consumed all the read packet - read another next time
readNextPacket = YES; readNextPacket = YES;
} }
else
{
lastReadPacket->data += len;
lastReadPacket->size -= len;
}
} }
int toConsume = FFMIN((dataSize - bytesConsumedFromDecodedFrame), (bytesToRead - bytesRead)); int toConsume = FFMIN((dataSize - bytesConsumedFromDecodedFrame), (bytesToRead - bytesRead));
@ -252,7 +256,7 @@ int lockmgr_callback(void ** mutex, enum AVLockOp op)
else { else {
uint8_t * out = ( uint8_t * ) targetBuf + bytesRead; uint8_t * out = ( uint8_t * ) targetBuf + bytesRead;
int bytesPerSample = bitsPerSample / 8; int bytesPerSample = bitsPerSample / 8;
int bytesConsumedPerPlane = bytesConsumedFromDecodedFrame / bytesPerSample; int bytesConsumedPerPlane = bytesConsumedFromDecodedFrame / channels;
int toConsumePerPlane = toConsume / channels; int toConsumePerPlane = toConsume / channels;
for (int s = 0; s < toConsumePerPlane; s += bytesPerSample) { for (int s = 0; s < toConsumePerPlane; s += bytesPerSample) {
for (int ch = 0; ch < channels; ++ch) { for (int ch = 0; ch < channels; ++ch) {