CUETools.Flake: better use of new window functions

Author: gchudov

CUETools.Codecs.ALAC/ALACWriter.cs

@@ -1162,7 +1162,10 @@ unsafe int encode_frame(ref int size)
 					_windowcount = 0;
 					calculate_window(window, lpc.window_welch, WindowFunction.Welch);
 					calculate_window(window, lpc.window_bartlett, WindowFunction.Bartlett);
-					calculate_window(window, lpc.window_tukey, WindowFunction.Tukey);
+                    calculate_window(window, (w, wsz) =>
+                    {
+                        lpc.window_tukey(w, wsz, 0.5);
+                    }, WindowFunction.Tukey);
 					calculate_window(window, lpc.window_hann, WindowFunction.Hann);
 					calculate_window(window, lpc.window_flattop, WindowFunction.Flattop);
                     int tukey_parts = 2;
@@ -1171,7 +1174,7 @@ unsafe int encode_frame(ref int size)
                     for (int m = 0; m < tukey_parts; m++)
                         calculate_window(window, (w, wsz) =>
                         {
-                            lpc.window_punchout_tukey(w, wsz, 0.1,
+                            lpc.window_punchout_tukey(w, wsz, 0.1, 0.1,
                                 m / (tukey_parts + overlap_units),
                                 (m + 1 + overlap_units) / (tukey_parts + overlap_units));
                         }, WindowFunction.PartialTukey);
@@ -1183,7 +1186,7 @@ unsafe int encode_frame(ref int size)
                     for (int m = 0; m < tukey_parts; m++)
                         calculate_window(window, (w, wsz) =>
                         {
-                            lpc.window_punchout_tukey(w, wsz, 0.1,
+                            lpc.window_punchout_tukey(w, wsz, 0.1, 0.1,
                                 m / (tukey_parts + overlap_units),
                                 (m + 1 + overlap_units) / (tukey_parts + overlap_units));
                         }, WindowFunction.PunchoutTukey);

CUETools.Codecs.FLACCL/FLACCLWriter.cs

@@ -1118,7 +1118,10 @@ unsafe void initializeSubframeTasks(int blocksize, int channelsCount, int nFrame
             {
                 calculate_window(task, lpc.window_welch, WindowFunction.Welch);
                 calculate_window(task, lpc.window_flattop, WindowFunction.Flattop);
-                calculate_window(task, lpc.window_tukey, WindowFunction.Tukey);
+                calculate_window(task, (w, wsz) =>
+                {
+                    lpc.window_tukey(w, wsz, 0.5);
+                }, WindowFunction.Tukey);
                 calculate_window(task, lpc.window_hann, WindowFunction.Hann);
                 calculate_window(task, lpc.window_bartlett, WindowFunction.Bartlett);
                 if (task.nWindowFunctions == 0)

CUETools.Codecs.FLAKE/FlacSubframeInfo.cs

@@ -8,6 +8,7 @@ public FlacSubframeInfo()
         {
             best = new FlacSubframe();
             sf = new LpcSubframeInfo();
+            best_fixed = new ulong[5];
             lpc_ctx = new LpcContext[lpc.MAX_LPC_WINDOWS];
             for (int i = 0; i < lpc.MAX_LPC_WINDOWS; i++)
                 lpc_ctx[i] = new LpcContext();
@@ -20,6 +21,8 @@ public void Init(int* s, int* r, int bps, int w)
             samples = s;
             obits = bps - w;
             wbits = w;
+            for (int o = 0; o <= 4; o++)
+                best_fixed[o] = 0;
             best.residual = r;
             best.type = SubframeType.Verbatim;
             best.size = AudioSamples.UINT32_MAX;
@@ -35,6 +38,7 @@ public void Init(int* s, int* r, int bps, int w)
         public int wbits;
         public int* samples;
         public uint done_fixed;
+        public ulong[] best_fixed;
         public LpcContext[] lpc_ctx;
         public LpcSubframeInfo sf;
     };