From c8ad24113267938fbecc37fbb10da2a40a9ee7a9 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sun, 5 Aug 2012 22:40:56 +0200 Subject: [PATCH] Bump minimum required QAAC version v1.39. --- doc/FAQ.html | 4 +- .../OpusTools-Git20120805-Progress.diff | 94 +++++++++++++++++++ src/Config.h | 2 +- src/Thread_Initialization.cpp | 2 + 4 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 etc/Patches/OpusTools-Git20120805-Progress.diff diff --git a/doc/FAQ.html b/doc/FAQ.html index c4a6a733..d689de79 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html @@ -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 downloaded for free from the official Apple web-site.

In order to enable the QAAC Encoder support you will also need the 'QAAC Encoder Add-in' for LameXP:
+
  • http://www.mediafire.com/file/o5is7bqporboa7b/LameXP.qaac-addin.2012-08-05.zip +
  • http://mulder.brhack.net/public/add-in/LameXP.qaac-addin.2012-08-05.zip
    Please follow the install instructions that are included with the 'QAAC Encoder Add-in' download package!
    Note that you do NOT need to install this Add-in, if you only want to use the Nero AAC Encoder.
    diff --git a/etc/Patches/OpusTools-Git20120805-Progress.diff b/etc/Patches/OpusTools-Git20120805-Progress.diff new file mode 100644 index 00000000..813d7659 --- /dev/null +++ b/etc/Patches/OpusTools-Git20120805-Progress.diff @@ -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 + # include + # 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;i0 && inopt.total_samples_per_channel 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; }