6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-19 19:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Give the FilterGenerator ownership of kernel sizes.

Browse Source
This commit is contained in:
Thomas Harte
2026-01-18 09:08:10 -05:00
parent e5efed202f
commit db163ec362
3 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OSBindings/Mac/Clock Signal/ScanTarget/CSScanTarget.mm
-1
View File
@@ -703,7 +703,6 @@ using BufferingScanTarget = Outputs::Display::BufferingScanTarget;
Outputs::Display::FilterGenerator generator(
_lineBufferPixelsPerLine,
colourCyclesPerLine,
15,
isSVideoOutput ? DecodingPath::SVideo : DecodingPath::Composite
);
Outputs/ScanTargets/FilterGenerator.cpp
+13 -29
View File
@@ -15,12 +15,10 @@ using namespace Outputs::Display;
FilterGenerator::FilterGenerator(
const float samples_per_line,
const float subcarrier_frequency,
const size_t max_kernel_size,
DecodingPath decoding_path
) :
samples_per_line_(samples_per_line),
subcarrier_frequency_(subcarrier_frequency),
max_kernel_size_(max_kernel_size),
decoding_path_(decoding_path) {}
float FilterGenerator::radians_per_sample() const {
@@ -32,29 +30,22 @@ FilterGenerator::FilterPair FilterGenerator::separation_filter() {
// Luminance.
result.luma =
SignalProcessing::Box::filter<SignalProcessing::ScalarType::Float>(
radians_per_sample(),
std::numbers::pi_v<float> * 2.0f
SignalProcessing::KaiserBessel::filter<SignalProcessing::ScalarType::Float>(
MaxKernelSize,
samples_per_line_,
10.0f,
subcarrier_frequency_ * 0.5f
);
// Usually provides a better luminance filter, but has issues with in-phase NTSC colour:
//
// SignalProcessing::KaiserBessel::filter<SignalProcessing::ScalarType::Float>(
// max_kernel_size_,
// samples_per_line_,
// 0.0f,
// subcarrier_frequency_ * 0.5f
// );
// Chrominance.
result.chroma = SignalProcessing::KaiserBessel::filter<SignalProcessing::ScalarType::Float>(
max_kernel_size_,
15,
samples_per_line_,
subcarrier_frequency_,
samples_per_line_
);
SignalProcessing::KaiserBessel::filter<SignalProcessing::ScalarType::Float>(
max_kernel_size_,
15,
samples_per_line_,
0.0f,
subcarrier_frequency_
@@ -84,24 +75,17 @@ FilterGenerator::FilterPair FilterGenerator::demouldation_filter() {
// Composite: sharpen the luminance a touch.
result.luma =
SignalProcessing::KaiserBessel::filter<SignalProcessing::ScalarType::Float>(
max_kernel_size_, samples_per_line_, 10.0f, subcarrier_frequency_);
MaxKernelSize, samples_per_line_, 30.0f, subcarrier_frequency_);
}
result.chroma =
SignalProcessing::Box::filter<SignalProcessing::ScalarType::Float>(
radians_per_sample(),
std::numbers::pi_v<float> * 2.0f
SignalProcessing::KaiserBessel::filter<SignalProcessing::ScalarType::Float>(
MaxKernelSize,
samples_per_line_,
0.0f,
subcarrier_frequency_ * 0.5f
)
* (decoding_path_ == DecodingPath::SVideo ? 2.0f : 0.5f);
// Usually provides a better chroma filter, but has issues with in-phase NTSC colour:
//
// SignalProcessing::KaiserBessel::filter<SignalProcessing::ScalarType::Float>(
// max_kernel_size_,
// samples_per_line_,
// 0.0f,
// subcarrier_frequency_ * 0.5f
// )
return result;
}
Outputs/ScanTargets/FilterGenerator.hpp
+2 -2
View File
@@ -16,6 +16,8 @@ namespace Outputs::Display {
class FilterGenerator {
public:
static constexpr size_t MaxKernelSize = 31;
enum class DecodingPath {
Composite,
SVideo
@@ -24,7 +26,6 @@ public:
FilterGenerator(
float samples_per_line,
float subcarrier_frequency,
size_t max_kernel_size,
DecodingPath
);
@@ -48,7 +49,6 @@ public:
private:
float samples_per_line_;
float subcarrier_frequency_;
size_t max_kernel_size_;
DecodingPath decoding_path_;
float radians_per_sample() const;