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

diff --git a/doc/Changelog.html b/doc/Changelog.html
index a213fbe..fb33e2d 100644 (file)
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@@ -25,7 +25,7 @@ a:visited { color: #0000EE; }
 <li>Added "Up One Level" button to the output folder tab
 <li>Added Opus decoder option to output always at the native sample rate of 48.000 Hz
 <li>Updated Qt runtime libraries to v4.8.4 (2012-11-29), compiled with MSVC 11.0
-<li>Updated Opus encoder/decoder libraries to v1.1.x and Opus-Tools to v0.1.6 (2013-02-09)
+<li>Updated Opus encoder/decoder libraries to v1.1.x and Opus-Tools to v0.1.6 (2013-03-12)
 <li>Updated Valdec decoder to v1.4.0a (2013-02-11), based on latest AC3Filter Tools
 <li>Updated MediaInfo to v0.7.62 (2013-02-22), compiled with ICL 12.1.7 and MSVC 10.0
 <li>Updated SoX to to v14.4.1 (2012-02-09), compiled with ICL 13.0 and MSVC 10.0

diff --git a/etc/Patches/OpusTools-Git20130312-Progress+NoResample.diff b/etc/Patches/OpusTools-Git20130312-Progress+NoResample.diff
new file mode 100644 (file)
index 0000000..8460c69
--- /dev/null
+++ b/etc/Patches/OpusTools-Git20130312-Progress+NoResample.diff
@@ -0,0 +1,153 @@
+ src/opusdec.c        | 24 +++++++++++++++++++++---
+ src/opusenc.c        | 17 +++++++----------
+ win32/genversion.bat | 15 ---------------
+ win32/version.h      |  2 +-
+ 4 files changed, 29 insertions(+), 29 deletions(-)
+
+diff --git a/src/opusdec.c b/src/opusdec.c
+index b23ae62..bfb2b68 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))
+@@ -658,6 +659,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;
+@@ -667,6 +669,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;
+@@ -682,6 +685,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;
+@@ -743,7 +747,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);
+@@ -825,6 +832,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
+@@ -989,10 +1006,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 b24f7c7..147bc07 100644
+--- a/src/opusenc.c
++++ b/src/opusenc.c
+@@ -968,6 +968,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){
+@@ -975,20 +976,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);
+diff --git a/win32/genversion.bat b/win32/genversion.bat
+index 9bc6917..5388813 100644
+--- a/win32/genversion.bat
++++ b/win32/genversion.bat
+@@ -1,17 +1,2 @@
+ @echo off
+ 
+-for /f %%v in ('git describe --tags --match "v*"') do set version=%%v
+-
+-set version_out=#define %2 "%version%"
+-
+-echo %version_out% > %1_temp
+-
+-echo n | comp %1_temp %1 > NUL 2> NUL
+-
+-if not errorlevel 1 goto exit
+-
+-copy /y %1_temp %1
+-
+-:exit
+-
+-del %1_temp
+diff --git a/win32/version.h b/win32/version.h
+index 72d7eb6..71cbcf6 100644
+--- a/win32/version.h
++++ b/win32/version.h
+@@ -1 +1 @@
+-#define VERSION "v0.1.6git"
++#define VERSION "v0.1.6 [2013-03-12]"

diff --git a/etc/Patches/OpusTools-Git20130118-Progress+NoResample.diff b/etc/Patches/deprecated/OpusTools-Git20130118-Progress+NoResample.diff
similarity index 100%
rename from etc/Patches/OpusTools-Git20130118-Progress+NoResample.diff
rename to etc/Patches/deprecated/OpusTools-Git20130118-Progress+NoResample.diff

diff --git a/res/tools/opusdec.exe b/res/tools/opusdec.exe
index 8b25fbf..fc63a6a 100644 (file)
Binary files a/res/tools/opusdec.exe and b/res/tools/opusdec.exe differ

diff --git a/res/tools/opusenc.exe b/res/tools/opusenc.exe
index 88f7965..8f14d28 100644 (file)
Binary files a/res/tools/opusenc.exe and b/res/tools/opusenc.exe differ

diff --git a/src/Config.h b/src/Config.h
index 48c384c..48d1358 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO                                    7
 #define VER_LAMEXP_TYPE                                                Beta
 #define VER_LAMEXP_PATCH                                       9
-#define VER_LAMEXP_BUILD                                       1254
+#define VER_LAMEXP_BUILD                                       1255
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)

diff --git a/src/Tools.h b/src/Tools.h
index 684dea8..f8e5d04 100644 (file)
--- a/src/Tools.h
+++ b/src/Tools.h
@@ -73,8 +73,8 @@ 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"},
-       {"e3524dc0a600d26a81dd17fe537ab367d9e6a045c8cab072b5dad35245b6369ac63cd76b7d4347cb541d4b7ea7e9b7fa", CPU_TYPE_ALL_ALL, "opusdec.exe", 20130209, ""},
-       {"7edf5bf3fe56d73d7b0ddfae5fea4b82b488d8fc5250b03eb3d1d8e5cdcb68dabe38b53ea2dca52794e062f2e6609168", CPU_TYPE_ALL_ALL, "opusenc.exe", 20130209, ""},
+       {"50d8e3ab97d68659726053fa397b939666161842f13d62f34071b9c186d6e60016b21c1c6119bb2265526f88251df82c", CPU_TYPE_ALL_ALL, "opusdec.exe", 20130312, ""},
+       {"3daabb5fb3a2bc45c4da8fec8ac17ab04f033291142973626e8ed378ca288655e4d10b36f42fed012c93064683020865", CPU_TYPE_ALL_ALL, "opusenc.exe", 20130312, ""},
        {"bdfa8dec142b6327a33af6bb314d7beb924588d1b73f2ef3f46b31fa6046fe2f4e64ca78b025b7eb9290a78320e2aa57", CPU_TYPE_ALL_ALL, "refalac.exe", 56, ""},
        {"d041b60de6c5c6e77cbad84440db57bbeb021af59dd0f7bebd3ede047d9e2ddc2a0c14179472687ba91063743d23e337", CPU_TYPE_ALL_ALL, "shorten.exe", 361, ""},
        {"cf988bfbb53e77a1dcaefbd5c08789abb4d67cc210723f1f8ba7850f17d34ebb7d0c426b67b963e7d2290a2744865244", CPU_TYPE_ALL_ALL, "sox.exe", 1441, ""},