Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-09 16:13:49 +02:00
Code Issues Projects Releases Wiki Activity

Merged 'stable'

Browse Source
This commit is contained in:
Fred Gleason
2018-08-23 16:02:45 +00:00
parent 3ad7581dc8 58fa103f6e
commit 116e790af4
24 changed files with 1100 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/rdaudioconvert.cpp
View File

@@ -656,7 +656,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage1Mpeg(const QString &dstfile,
return RDAudioConvert::ErrorFormatError;
}
memmove(buffer,mad_stream.next_frame,left_over);
usleep(conv_config->transcodingDelay());
}
memset(buffer+left_over,0,MAD_BUFFER_GUARD);
mad_stream_buffer(&mad_stream,buffer,MAD_BUFFER_GUARD+left_over);
@@ -886,6 +886,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage1SndFile(const QString &dstfile,
if((end-start)<buffer_size) {
buffer_size=end-start;
}
usleep(conv_config->transcodingDelay());
}
delete buffer;
sf_close(sf_dst);
@@ -1074,6 +1075,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage2Convert(const QString &srcfile,
sf_close(dst_sf);
return RDAudioConvert::ErrorNoSpace;
}
usleep(conv_config->transcodingDelay());
}
//
@@ -1097,6 +1099,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage2Convert(const QString &srcfile,
sf_close(dst_sf);
return RDAudioConvert::ErrorNoSpace;
}
usleep(conv_config->transcodingDelay());
}
delete st_conv;
}
@@ -1509,6 +1512,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Layer3(SNDFILE *src_sf,
return RDAudioConvert::ErrorNoSpace;
}
}
usleep(conv_config->transcodingDelay());
}
}
else {
@@ -1519,6 +1523,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Layer3(SNDFILE *src_sf,
::close(dst_fd);
return RDAudioConvert::ErrorNoSpace;
}
usleep(conv_config->transcodingDelay());
}
}
}
@@ -1648,6 +1653,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Layer2Wav(SNDFILE *src_sf,
else {
fprintf(stderr,"TwoLAME encode error\n");
}
usleep(conv_config->transcodingDelay());
}
if((s=twolame_encode_flush(lameopts,mpeg,2048))>=0) {
if(wave->writeWave(mpeg,s)!=s) {
@@ -1750,6 +1756,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Layer2(SNDFILE *src_sf,
else {
fprintf(stderr,"TwoLAME encode error\n");
}
usleep(conv_config->transcodingDelay());
}
if((s=twolame_encode_flush(lameopts,mpeg,2048))>=0) {
if(write(dst_fd,mpeg,s)!=s) {
@@ -1816,6 +1823,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Pcm16(SNDFILE *src_sf,
delete wave;
return RDAudioConvert::ErrorNoSpace;
}
usleep(conv_config->transcodingDelay());
}
delete sf_buffer;
wave->closeWave();
@@ -1865,6 +1873,7 @@ RDAudioConvert::ErrorCode RDAudioConvert::Stage3Pcm24(SNDFILE *src_sf,
delete wave;
return RDAudioConvert::ErrorNoSpace;
}
usleep(conv_config->transcodingDelay());
}
delete sf_buffer;
delete pcm24;