Extra asserts to ensure samples are decoded properly

CookiePLMonster · Feb 8, 2017 · f5ee459 · f5ee459
1 parent e49bbaa
commit f5ee459
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/vagdec.cpp b/vagdec.cpp
@@ -121,6 +121,8 @@ static short quantize(double sample)
 	return short(a);
 }
 
+#include <cassert>
+
 bool FetchStr( ASISTREAM *STR, int offset = -1 )
 {
 	U8 in_buf[0x20];
@@ -159,6 +161,7 @@ bool FetchStr( ASISTREAM *STR, int offset = -1 )
 		int predict_nr = *(bufs[c]++);
 		int shift_factor = predict_nr & 0xf;
 		predict_nr >>= 4;
+		assert( predict_nr < 5 );
 		int flags = *(bufs[c]++);
 		if ( flags == 7 ) return false;
 		for ( int i = 0; i < 28; i += 2 )

diff --git a/vbcalls.cpp b/vbcalls.cpp
@@ -4,6 +4,8 @@
 #include <vector>
 #include <algorithm>
 
+#include <cassert>
+
 class VBStream
 {
 public:
@@ -97,6 +99,7 @@ class VBStream
 			}
 		}
 		virtualCursor += Bytes;
+		assert( (virtualCursor & ((VB_SAMPLE_SIZE*2)-1)) == 0 );
 		return Bytes;
 	}
 
@@ -136,6 +139,7 @@ class VBStream
 				ReadBlockAndInterleave();
 				currentBlockCursor = OffsetNoHeader & (VB_BLOCK_SIZE-1);
 			}
+			assert( (currentBlockCursor & ((VB_SAMPLE_SIZE*2)-1)) == 0 );
 		}
 		else
 		{

diff --git a/vbdec.vcxproj b/vbdec.vcxproj
@@ -54,13 +54,17 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>mss/mss32.lib;mss/mss32_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <PostBuildEvent>
+      <Command>copy /y "$(TargetPath)" "$(GTA_VC_ROOT)\mss\vbdec.asi"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -76,6 +80,7 @@
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
       <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -84,6 +89,9 @@
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
       <SubSystem>Windows</SubSystem>
     </Link>
+    <PostBuildEvent>
+      <Command>copy /y "$(TargetPath)" "$(GTA_VC_ROOT)\mss\vbdec.asi"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp" />