Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Bump minimum required QAAC version v1.39.

Browse Source
This commit is contained in:
LoRd_MuldeR 2012-08-05 22:40:56 +02:00
parent 637cc4d884
commit c8ad241132
4 changed files with 99 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/FAQ.html
View File

@ -386,8 +386,8 @@ QAAC encoder, then you have to install QuickTime v7.7.1 (or newer). Alternativel
be installed. Both, QuickTime and iTunes, can be <a href="http://www.apple.com/quicktime/download/" target="_blank">downloaded for free</a> from the official Apple web-site.<br>
<br>
In order to enable the QAAC Encoder support you will also need the 'QAAC Encoder Add-in' for LameXP:<br><ul>
<li><a href="http://www.mediafire.com/file/ggq8vetr8fkfxkm/LameXP.qaac-addin.2012-03-06.zip" target="_blank">http://www.mediafire.com/file/uayr4fbbohx9544/LameXP.qaac-addin.2012-03-06.zip</a>
<li><a href="http://mulder.brhack.net/public/add-in/LameXP.qaac-addin.2012-03-06.zip" target="_blank">http://mulder.brhack.net/public/add-in/LameXP.qaac-addin.2012-03-06.zip</a></ul>
<li><a href="http://www.mediafire.com/file/o5is7bqporboa7b/LameXP.qaac-addin.2012-08-05.zip" target="_blank">http://www.mediafire.com/file/o5is7bqporboa7b/LameXP.qaac-addin.2012-08-05.zip</a>
<li><a href="http://mulder.brhack.net/public/add-in/LameXP.qaac-addin.2012-08-05.zip" target="_blank">http://mulder.brhack.net/public/add-in/LameXP.qaac-addin.2012-08-05.zip</a></ul>
<br>
Please follow the install instructions that are included with the 'QAAC Encoder Add-in' download package!<br>
Note that you do NOT need to install this Add-in, if you only want to use the Nero AAC Encoder.<br>

94
etc/Patches/OpusTools-Git20120805-Progress.diff Normal file
View File

@ -0,0 +1,94 @@
src/opusdec.c | 17 +++++++++++++++--
src/opusenc.c | 17 +++++++----------
2 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/opusdec.c b/src/opusdec.c
index fd52b2b..3f685d4 100644
--- a/src/opusdec.c
+++ b/src/opusdec.c
@@ -57,6 +57,7 @@
# include <io.h>
# include <fcntl.h>
# define I64FORMAT "I64d"
+# define ftello64(_x) _ftelli64((_x))
#else
# define I64FORMAT "lld"
# define fopen_utf8(_x,_y) fopen((_x),(_y))
@@ -646,6 +647,7 @@ int main(int argc, char **argv)
int close_in=0;
int eos=0;
ogg_int64_t audio_size=0;
+ ogg_int64_t input_size=0;
double last_coded_seconds=0;
float loss_percent=-1;
float manual_gain=0;
@@ -797,6 +799,16 @@ int main(int argc, char **argv)
close_in=1;
}
+ /*detect input size*/
+ if(fin != stdin)
+ {
+ struct _stat64 info;
+ if(_fstati64(_fileno(fin), &info) == 0)
+ {
+ input_size = info.st_size;
+ }
+ }
+
/*Init Ogg data struct*/
ogg_sync_init(&oy);
@@ -919,10 +931,11 @@ int main(int argc, char **argv)
if(!quiet){
static const char spinner[]="|/-\\";
double coded_seconds = (double)audio_size/(channels*rate*sizeof(short));
+ double percent = (input_size>0) ? ((double)ftello64(fin))/((double)input_size) : 0.0;
if(coded_seconds>=last_coded_seconds+1){
- fprintf(stderr,"\r[%c] %02d:%02d:%02d", spinner[last_spin&3],
+ fprintf(stderr,"\r[%c] %02d:%02d:%02d (%.f%%)", spinner[last_spin&3],
(int)(coded_seconds/3600),(int)(coded_seconds/60)%60,
- (int)(coded_seconds)%60);
+ (int)(coded_seconds)%60,percent*100.0);
fflush(stderr);
last_spin++;
last_coded_seconds=coded_seconds;
diff --git a/src/opusenc.c b/src/opusenc.c
index 3051bee..0a5bc4f 100644
--- a/src/opusenc.c
+++ b/src/opusenc.c
@@ -910,6 +910,7 @@ int main(int argc, char **argv)
double estbitrate;
double coded_seconds=nb_encoded/(double)coding_rate;
double wall_time=(stop_time-start_time)+1e-6;
+ double percent = 0.0;
char sbuf[55];
static const char spinner[]="|/-\\";
if(!with_hard_cbr){
@@ -917,20 +918,16 @@ int main(int argc, char **argv)
estbitrate=(total_bytes*8.0/coded_seconds)*tweight+
bitrate*(1.-tweight);
}else estbitrate=nbBytes*8*((double)coding_rate/frame_size);
+ if(inopt.total_samples_per_channel>0){
+ percent = ((double)nb_encoded) / ((double)inopt.total_samples_per_channel);
+ }
fprintf(stderr,"\r");
for(i=0;i<last_spin_len;i++)fprintf(stderr," ");
- if(inopt.total_samples_per_channel>0 && inopt.total_samples_per_channel<nb_encoded){
- snprintf(sbuf,54,"\r[%c] %02d%% ",spinner[last_spin&3],
- (int)floor(nb_encoded/(double)(inopt.total_samples_per_channel+inopt.skip)*100.));
- }else{
- snprintf(sbuf,54,"\r[%c] ",spinner[last_spin&3]);
- }
- last_spin_len=strlen(sbuf);
- snprintf(sbuf+last_spin_len,54-last_spin_len,
- "%02d:%02d:%02d.%02d %4.3gx realtime, %5.4gkbit/s",
+ snprintf(sbuf,54,"\r[%c] %02d:%02d:%02d.%02d (%.f%%) %4.3gx realtime, %5.4gkbit/s",
+ spinner[last_spin&3],
(int)(coded_seconds/3600),(int)(coded_seconds/60)%60,
(int)(coded_seconds)%60,(int)(coded_seconds*100)%100,
- coded_seconds/wall_time,
+ percent*100.0,coded_seconds/wall_time,
estbitrate/1000.);
fprintf(stderr,"%s",sbuf);
fflush(stderr);

2
src/Config.h
View File

@ -38,7 +38,7 @@
#define VER_LAMEXP_TOOL_NEROAAC 1540
#define VER_LAMEXP_TOOL_FHGAACENC 20110822
#define VER_LAMEXP_TOOL_QAAC 131
#define VER_LAMEXP_TOOL_QAAC 139
#define VER_LAMEXP_TOOL_COREAUDIO 7710
///////////////////////////////////////////////////////////////////////////////

2
src/Thread_Initialization.cpp
View File

@ -695,6 +695,7 @@ void InitializationThread::initQAac(void)
else if(qaacVersion < lamexp_toolver_qaacenc())
{
qWarning("QAAC version is too much outdated (%s) -> QAAC support will be disabled!", lamexp_version2string("v?.??", qaacVersion, "N/A").toLatin1().constData());
qWarning("Minimum required QAAC version currently is: %s.\n", lamexp_version2string("v?.??", lamexp_toolver_qaacenc(), "N/A").toLatin1().constData());
for(int i = 0; i < 2; i++) LAMEXP_DELETE(qaacBin[i]);
return;
}
@ -708,6 +709,7 @@ void InitializationThread::initQAac(void)
else if(coreVersion < lamexp_toolver_coreaudio())
{
qWarning("CoreAudioToolbox version is too much outdated (%s) -> QAAC support will be disabled!", lamexp_version2string("v?.?.?.?", coreVersion, "N/A").toLatin1().constData());
qWarning("Minimum required CoreAudioToolbox version currently is: %s.\n", lamexp_version2string("v?.??", lamexp_toolver_coreaudio(), "N/A").toLatin1().constData());
for(int i = 0; i < 2; i++) LAMEXP_DELETE(qaacBin[i]);
return;
}