8 Samples per PCLK in RAW/Composite View

BreaksPPU/PPUPlayer/FormCompositeViewer.cs

@@ -75,20 +75,11 @@ public FormCompositeViewer(string filename)
 			}
 		}
 
-		private void FormCompositeViewer_KeyDown(object sender, KeyEventArgs e)
-		{
-			if (e.KeyCode == Keys.Escape)
-			{
-				Close();
-			}
-		}
-
 		void ResetVisualize()
 		{
 			PPUPlayerInterop.GetSignalFeatures(out ppu_features);
 
-			// In Logisim the samples are sampled every CLK, not every half-cycle as in combat. Therefore, you must divide by 2.
-			SamplesPerScan = ppu_features.PixelsPerScan * ppu_features.SamplesPerPCLK / 2;
+			SamplesPerScan = ppu_features.PixelsPerScan * ppu_features.SamplesPerPCLK;
 			ScanBuffer = new PPUPlayerInterop.VideoOutSample[2 * SamplesPerScan];
 			WritePtr = 0;
 
@@ -136,9 +127,6 @@ void ProcessScanComposite()
 			float normalize_factor = 1.0f / ppu_features.WhiteLevel;
 			PPUPlayerInterop.VideoOutSample[] batch = new PPUPlayerInterop.VideoOutSample[num_phases];
 
-			// In Logisim the samples are sampled every CLK, not every half-cycle as in combat. Therefore, you must divide by 2.
-			int SamplesPerPixelInLogisimDump = ppu_features.SamplesPerPCLK / 2;
-
 			// Skip HSync
 
 			while (ScanBuffer[ReadPtr].composite <= ppu_features.SyncLevel)
@@ -150,7 +138,7 @@ void ProcessScanComposite()
 
 			int cb_phase = PLL();
 
-			ReadPtr += ppu_features.BackPorchSize * SamplesPerPixelInLogisimDump;
+			ReadPtr += ppu_features.BackPorchSize * ppu_features.SamplesPerPCLK;
 
 			// Output the visible part of the signal
 
@@ -160,7 +148,7 @@ void ProcessScanComposite()
 				{
 					// Extract the median sample batch
 
-					int MidPtr = ReadPtr + i * SamplesPerPixelInLogisimDump - num_phases / 2;
+					int MidPtr = ReadPtr + i * ppu_features.SamplesPerPCLK - num_phases / 2;
 
 					for (int n = 0; n < num_phases; n++)
 					{
@@ -171,7 +159,7 @@ void ProcessScanComposite()
 
 					float Y = 0, I = 0, Q = 0;
 
-					float ofs = i * SamplesPerPixelInLogisimDump;
+					float ofs = i * ppu_features.SamplesPerPCLK;
 
 					// TBD: For now, a hack to tweak Hue. Interestingly, PPUSim does not require this tweaking.
 					float hue_adj = 0.35f;
@@ -209,12 +197,9 @@ void ProcessScanComposite()
 
 		int PLL()
 		{
-			// In Logisim the samples are sampled every CLK, not every half-cycle as in combat. Therefore, you must divide by 2.
-			int SamplesPerPixelInLogisimDump = ppu_features.SamplesPerPCLK / 2;
-
 			int ReadPtr = SyncPos;
 			int num_phases = 12;
-			int samples = ppu_features.BackPorchSize * SamplesPerPixelInLogisimDump;
+			int samples = ppu_features.BackPorchSize * ppu_features.SamplesPerPCLK;
 
 			// Skip HSync
 
@@ -301,5 +286,13 @@ private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
 			int n = comboBox1.SelectedIndex;
 			ShowField(n);
 		}
+
+		private void FormCompositeViewer_KeyDown_1(object sender, KeyEventArgs e)
+		{
+			if (e.KeyCode == Keys.Escape)
+			{
+				Close();
+			}
+		}
 	}
 }

BreaksPPU/PPUPlayer/FormRawViewer.cs

@@ -72,8 +72,7 @@ void ResetVisualize()
 		{
 			PPUPlayerInterop.GetSignalFeatures(out ppu_features);
 
-			// In Logisim the samples are sampled every CLK, not every half-cycle as in combat. Therefore, you must divide by 2.
-			SamplesPerScan = ppu_features.PixelsPerScan * ppu_features.SamplesPerPCLK / 2;
+			SamplesPerScan = ppu_features.PixelsPerScan * ppu_features.SamplesPerPCLK;
 			ScanBuffer = new PPUPlayerInterop.VideoOutSample[2 * SamplesPerScan];
 			WritePtr = 0;
 
@@ -118,17 +117,14 @@ void ProcessScanRAW()
 		{
 			int ReadPtr = SyncPos;
 
-			// In Logisim the samples are sampled every CLK, not every half-cycle as in combat. Therefore, you must divide by 2.
-			int SamplesPerPixelInLogisimDump = ppu_features.SamplesPerPCLK / 2;
-
 			// Skip HSync and Back Porch
 
 			while ((ScanBuffer[ReadPtr].raw & 0b1000000000) != 0)
 			{
 				ReadPtr++;
 			}
 
-			ReadPtr += ppu_features.BackPorchSize * SamplesPerPixelInLogisimDump;
+			ReadPtr += ppu_features.BackPorchSize * ppu_features.SamplesPerPCLK;
 
 			// Output the visible part of the signal
 
@@ -142,7 +138,7 @@ void ProcessScanRAW()
 					field[CurrentScan * 256 + i] = Color.FromArgb(r, g, b);
 				}
 
-				ReadPtr += SamplesPerPixelInLogisimDump;
+				ReadPtr += ppu_features.SamplesPerPCLK;
 			}
 
 			CurrentScan++;