From 6312b2a86ad208f26867d6573b2f7e7d0e033b99 Mon Sep 17 00:00:00 2001
From: Grigory Chudov <gchudov@gmail.com>
Date: Mon, 19 Feb 2018 14:04:14 -0500
Subject: [PATCH] CUETools.Codecs.ALAC: fix a bug that was causing corruption
 of the last 4 bytes in some files.

---
 CUETools.ALACEnc/App.config              |  8 ++++
 CUETools.ALACEnc/CUETools.ALACEnc.csproj |  5 +-
 CUETools.Codecs.ALAC/ALACWriter.cs       | 61 ++++++++++++------------
 3 files changed, 42 insertions(+), 32 deletions(-)
 create mode 100644 CUETools.ALACEnc/App.config

diff --git a/CUETools.ALACEnc/App.config b/CUETools.ALACEnc/App.config
new file mode 100644
index 0000000..220cf55
--- /dev/null
+++ b/CUETools.ALACEnc/App.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="plugins"/>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/CUETools.ALACEnc/CUETools.ALACEnc.csproj b/CUETools.ALACEnc/CUETools.ALACEnc.csproj
index 1084620..a28aba5 100644
--- a/CUETools.ALACEnc/CUETools.ALACEnc.csproj
+++ b/CUETools.ALACEnc/CUETools.ALACEnc.csproj
@@ -36,7 +36,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -88,6 +88,9 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CUETools.Codecs.ALAC/ALACWriter.cs b/CUETools.Codecs.ALAC/ALACWriter.cs
index 70d476b..7bedc16 100644
--- a/CUETools.Codecs.ALAC/ALACWriter.cs
+++ b/CUETools.Codecs.ALAC/ALACWriter.cs
@@ -492,14 +492,16 @@ namespace CUETools.Codecs.ALAC
 			res[0] = smp[0];
 			for (int i = 1; i < n; i++)
 				res[i] = smp[i] - smp[i - 1];
-		}
+            res[n] = 1; // Stop byte to help alac_entropy_coder;
+        }
 
-		unsafe static void alac_encode_residual_0(int* res, int* smp, int n)
+        unsafe static void alac_encode_residual_0(int* res, int* smp, int n)
 		{
 			AudioSamples.MemCpy(res, smp, n);
-		}
+            res[n] = 1; // Stop byte to help alac_entropy_coder;
+        }
 
-		unsafe static void alac_encode_residual(int* res, int* smp, int n, int order, int* coefs, int shift, int bps)
+        unsafe static void alac_encode_residual(int* res, int* smp, int n, int order, int* coefs, int shift, int bps)
 		{
 			int csum = 0;
 
@@ -838,35 +840,32 @@ namespace CUETools.Codecs.ALAC
 			}
 		}
 
-		unsafe void encode_residual(ALACFrame frame, int ch, int pass, int best_windows)
-		{
-			int* smp = frame.subframes[ch].samples;
-			int i, n = frame.blocksize;
+        unsafe void encode_residual(ALACFrame frame, int ch, int pass, int best_windows)
+        {
+            int* smp = frame.subframes[ch].samples;
+            int i, n = frame.blocksize;
             int bps = Settings.PCM.BitsPerSample + Settings.PCM.ChannelCount - 1;
 
-			// FIXED
-			//if (0 == (2 & frame.subframes[ch].done_fixed) && (pass != 1 || n < eparams.max_prediction_order))
-			//{
-			//    frame.subframes[ch].done_fixed |= 2;
-			//    frame.current.order = 31;
-			//    frame.current.window = -1;
-			//    alac_encode_residual_31(frame.current.residual, frame.subframes[ch].samples, frame.blocksize);
-			//    frame.current.size = (uint)(alac_entropy_coder(frame.current.residual, frame.blocksize, bps, out frame.current.ricemodifier) + 16);
-			//    frame.ChooseBestSubframe(ch);
-			//}
-			//if (0 == (1 & frame.subframes[ch].done_fixed) && (pass != 1 || n < eparams.max_prediction_order))
-			//{
-			//    frame.subframes[ch].done_fixed |= 1;
-			//    frame.current.order = 0;
-			//    frame.current.window = -1;
-			//    alac_encode_residual_0(frame.current.residual, frame.subframes[ch].samples, frame.blocksize);
-			//    frame.current.size = (uint)(alac_entropy_coder(frame.current.residual, frame.blocksize, bps, out frame.current.ricemodifier) + 16);
-			//    frame.ChooseBestSubframe(ch);
-			//}
-
-			// LPC
-			if (n < eparams.max_prediction_order)
-				return;
+            // FIXED
+            //if (0 == (2 & frame.subframes[ch].done_fixed) && (pass != 1 || n < eparams.max_prediction_order))
+            //{
+            //    frame.subframes[ch].done_fixed |= 2;
+            //    frame.current.order = 31;
+            //    frame.current.window = -1;
+            //    alac_encode_residual_31(frame.current.residual, frame.subframes[ch].samples, frame.blocksize);
+            //    frame.current.size = (uint)(alac_entropy_coder(frame.current.residual, frame.blocksize, bps, out frame.current.ricemodifier) + 16);
+            //    frame.ChooseBestSubframe(ch);
+            //}
+            //if (0 == (1 & frame.subframes[ch].done_fixed) && (pass != 1 || n < eparams.max_prediction_order))
+            if (0 == (1 & frame.subframes[ch].done_fixed) && n < eparams.max_prediction_order)
+            {
+                frame.subframes[ch].done_fixed |= 1;
+                frame.current.order = 0;
+                frame.current.window = -1;
+                alac_encode_residual_0(frame.current.residual, frame.subframes[ch].samples, frame.blocksize);
+                frame.current.size = (uint)(alac_entropy_coder(frame.current.residual, frame.blocksize, bps, out frame.current.ricemodifier) + 16);
+                frame.ChooseBestSubframe(ch);
+            }
 
 			float* lpcs = stackalloc float[lpc.MAX_LPC_ORDER * lpc.MAX_LPC_ORDER];
 			int min_order = eparams.min_prediction_order;