Updated Opus encoder/decoder libraries to v1.1.x and Opus-Tools to v0.1.6 (2013-06-16).

Copying.txt

@@ -5,3 +5,7 @@ The Qt GUI Toolkit is Copyright (C) 2013 Digia Finland Ltd and/or its subsidiary
 The copyright of all third-party programs included in LameXP belongs to the individual software authors. Please see the "About third-party software" dialog for details!
 
 The Nero AAC Encoder is Copyright (C) 2009 Nero AG. You may NOT redistribute the Nero AAC Encoder; it is NOT included in LameXP and may be obtained form the Nero web-site as a free download.
+
+-----
+
+Note: LameXP contains some third-party tools with custom modifications and fixes. The respective patches are provided in the "etc/Patches" directory...

doc/Changelog.html

@@ -19,6 +19,7 @@ a:visited { color: #0000EE; }
 
 <a name="4.08"></a>Changes between v4.07 and v4.08 [<font color="darkred">unreleased</font>]:<br><ul>
 <li>Updated FLAC encoder/decoder to v1.3.0 (2013-05-27), compiled with ICL 13.0
+<li>Fixed a superfluous "beep" sound that appeared on application startup
 </ul><br>
 
 <a name="4.07"></a>Changes between v4.06 and v4.07 [2013-04-28]:<br><ul>

etc/Patches/OpusTools-Git20130616-Progress+NoResample.diff

@@ -0,0 +1,118 @@
+diff --git a/src/opusdec.c b/src/opusdec.c
+index 2ed4ba3..b104954 100644
+--- a/src/opusdec.c
++++ b/src/opusdec.c
+@@ -53,6 +53,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))
+@@ -653,6 +654,7 @@ int main(int argc, char **argv)
+       {"force-wav", no_argument, NULL, 0},
+       {"packet-loss", required_argument, NULL, 0},
+       {"save-range", required_argument, NULL, 0},
++      {"no-resample", no_argument, NULL, 0},
+       {0, 0, 0, 0}
+    };
+    ogg_sync_state oy;
+@@ -662,6 +664,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;
+@@ -677,6 +680,7 @@ int main(int argc, char **argv)
+    int dither=1;
+    shapestate shapemem;
+    SpeexResamplerState *resampler=NULL;
++   int no_resample = 0;
+    float gain=1;
+    int streams=0;
+    size_t last_spin=0;
+@@ -738,7 +742,10 @@ int main(int argc, char **argv)
+             forcewav=1;
+          } else if (strcmp(long_options[option_index].name,"rate")==0)
+          {
+-            rate=atoi (optarg);
++            rate=((no_resample) ? 48000 : atoi(optarg));
++         } else if (strcmp(long_options[option_index].name,"no-resample")==0)
++         {
++            no_resample=1; rate=48000;
+          } else if (strcmp(long_options[option_index].name,"gain")==0)
+          {
+             manual_gain=atof (optarg);
+@@ -820,6 +827,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;
++      }
++   }
++
+    /* .opus files use the Ogg container to provide framing and timekeeping.
+     * http://tools.ietf.org/html/draft-terriberry-oggopus
+     * The easiest way to decode the Ogg container is to use libogg, so
+@@ -984,10 +1001,11 @@ int main(int argc, char **argv)
+                   /*Display a progress spinner while decoding.*/
+                   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 a2355d8..2f13414 100644
+--- a/src/opusenc.c
++++ b/src/opusenc.c
+@@ -1047,6 +1047,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){
+@@ -1054,20 +1055,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);

res/Tools_Encd.qrc

@@ -11,6 +11,7 @@
     <file>tools/oggenc2.i386.exe</file>
     <file>tools/oggenc2.sse2.exe</file>
     <file>tools/oggenc2.x64.exe</file>
-    <file>tools/opusenc.exe</file>
+    <file>tools/opusenc.i386.exe</file>
+    <file>tools/opusenc.sse2.exe</file>
   </qresource>
 </RCC>

src/Config.h

@@ -34,7 +34,7 @@
 #define VER_LAMEXP_MINOR_LO					8
 #define VER_LAMEXP_TYPE						Alpha
 #define VER_LAMEXP_PATCH					2
-#define VER_LAMEXP_BUILD					1292
+#define VER_LAMEXP_BUILD					1294
 #define VER_LAMEXP_CONFG					1288
 
 ///////////////////////////////////////////////////////////////////////////////

src/Tools.h

@@ -73,8 +73,9 @@ g_lamexp_tools[] =
 	{"8b68461f38410421be30cc895e94e63184daa6f2cb20eb110b66b376b48141838a09bc920efeb1c49de79dd0770ce41b", CPU_TYPE_X86_GEN, "oggenc2.i386.exe", 287603, "Beta"},
 	{"20648f83cc637cada481143d48c437ced8423e9a0aae01dbce860cd97fb1ce4000e314f3a5395d1eafd8e154a8e74d08", CPU_TYPE_X86_SSE, "oggenc2.sse2.exe", 287603, "Beta"},
 	{"e1da48055a57bae41d6a1a0dc08b86831c121e85c07aa60aae4196997b166a08cfb7265d9f0f289f445ad73bce28d81f", CPU_TYPE_X64_ALL, "oggenc2.x64.exe",  287603, "Beta"},
-	{"a0ad313485d661f9cbd16b13a6b6638a3557754808a34d369fcb0518ceb8c1dd8a1571839b1fb599fc2152f740ce6094", CPU_TYPE_ALL_ALL, "opusdec.exe", 20130423, "v1.1-alpha"},
+	{"8041eb916de4d93effc66e579650acb090a01620fdd93c2f23ef0e0e0efe988ef5d9c42b28496e66dd2a62333fcc3148", CPU_TYPE_ALL_ALL, "opusdec.exe", 20130616, "v1.1-alpha"},
-	{"e6fc17aad337b7a69a2b286a4b49e1424225b6bd7799ae257ed031a460c96d81181dc3d7643d1957d502d12ad2effbdf", CPU_TYPE_ALL_ALL, "opusenc.exe", 20130423, "v1.1-alpha"},
+	{"0017e6de205fa814144dfcb0b2df8983e6741d637c0bab9cfa8f8a2d6d222452e2faa3ad79adb5a9ed680f49e47dd876", CPU_TYPE_ALL_GEN, "opusenc.i386.exe", 20130616, "v1.1-alpha"},
+	{"ed6c385dbc345f30a4694519855c6703111b6a0855f7ec8e6078fd081289e8d3951bbaee8cb2675f552cc86105dd3735", CPU_TYPE_ALL_SSE, "opusenc.sse2.exe", 20130616, "v1.1-alpha"},
 	{"bdfa8dec142b6327a33af6bb314d7beb924588d1b73f2ef3f46b31fa6046fe2f4e64ca78b025b7eb9290a78320e2aa57", CPU_TYPE_ALL_ALL, "refalac.exe", 56, ""},
 	{"d041b60de6c5c6e77cbad84440db57bbeb021af59dd0f7bebd3ede047d9e2ddc2a0c14179472687ba91063743d23e337", CPU_TYPE_ALL_ALL, "shorten.exe", 361, ""},
 	{"cf988bfbb53e77a1dcaefbd5c08789abb4d67cc210723f1f8ba7850f17d34ebb7d0c426b67b963e7d2290a2744865244", CPU_TYPE_ALL_ALL, "sox.exe", 1441, ""},