added chromatic test. fixed extra pixel
This commit is contained in:
@@ -2,6 +2,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <random>
|
#include <random>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <cmath>
|
||||||
#include "../util/grid/grid2.hpp"
|
#include "../util/grid/grid2.hpp"
|
||||||
#include "../util/output/aviwriter.hpp"
|
#include "../util/output/aviwriter.hpp"
|
||||||
|
|
||||||
@@ -36,7 +37,7 @@ int main() {
|
|||||||
std::uniform_real_distribution<> colorDist(0.2f, 0.8f);
|
std::uniform_real_distribution<> colorDist(0.2f, 0.8f);
|
||||||
|
|
||||||
// Generate multiple seed points for more interesting patterns
|
// Generate multiple seed points for more interesting patterns
|
||||||
const int numSeeds = 8;
|
const int numSeeds = 1;
|
||||||
std::vector<Vec2> seedPoints;
|
std::vector<Vec2> seedPoints;
|
||||||
std::vector<Vec4> seedColors;
|
std::vector<Vec4> seedColors;
|
||||||
|
|
||||||
@@ -98,25 +99,40 @@ int main() {
|
|||||||
std::vector<int> rgbData;
|
std::vector<int> rgbData;
|
||||||
grid.getGridAsRGB(frameWidth, frameHeight, rgbData);
|
grid.getGridAsRGB(frameWidth, frameHeight, rgbData);
|
||||||
|
|
||||||
// Convert to BGR format for AVI (OpenCV uses BGR)
|
// Debug output to check frame dimensions
|
||||||
|
std::cout << "Frame " << frame << ": " << frameWidth << "x" << frameHeight
|
||||||
|
<< ", RGB data size: " << rgbData.size() << std::endl;
|
||||||
|
|
||||||
|
// Convert to BGR format for AVI and ensure proper 8-bit values
|
||||||
std::vector<uint8_t> bgrFrame(frameWidth * frameHeight * 3);
|
std::vector<uint8_t> bgrFrame(frameWidth * frameHeight * 3);
|
||||||
#pragma omp parallel for
|
#pragma omp parallel for
|
||||||
for (int i = 0; i < frameWidth * frameHeight; ++i) {
|
for (int i = 0; i < frameWidth * frameHeight; ++i) {
|
||||||
bgrFrame[i * 3] = rgbData[i * 3 + 2];
|
// Ensure values are in 0-255 range and convert RGB to BGR
|
||||||
bgrFrame[i * 3 + 1] = rgbData[i * 3 + 1];
|
int r = std::clamp(rgbData[i * 3], 0, 255);
|
||||||
bgrFrame[i * 3 + 2] = rgbData[i * 3];
|
int g = std::clamp(rgbData[i * 3 + 1], 0, 255);
|
||||||
|
int b = std::clamp(rgbData[i * 3 + 2], 0, 255);
|
||||||
|
|
||||||
|
bgrFrame[i * 3] = static_cast<uint8_t>(b); // B
|
||||||
|
bgrFrame[i * 3 + 1] = static_cast<uint8_t>(g); // G
|
||||||
|
bgrFrame[i * 3 + 2] = static_cast<uint8_t>(r); // R
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify frame size matches expected
|
||||||
|
if (bgrFrame.size() != width * height * 3) {
|
||||||
|
std::cerr << "ERROR: Frame size mismatch! Expected: " << width * height * 3
|
||||||
|
<< ", Got: " << bgrFrame.size() << std::endl;
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
// for (int i = 0; i < frameWidth * frameHeight; ++i) {
|
|
||||||
// bgrFrame[i * 3] = static_cast<uint8_t>(rgbData[i * 3 + 2]); // B
|
|
||||||
// bgrFrame[i * 3 + 1] = static_cast<uint8_t>(rgbData[i * 3 + 1]); // G
|
|
||||||
// bgrFrame[i * 3 + 2] = static_cast<uint8_t>(rgbData[i * 3]); // R
|
|
||||||
// }
|
|
||||||
|
|
||||||
frames.push_back(bgrFrame);
|
frames.push_back(bgrFrame);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save as AVI
|
// Save as AVI
|
||||||
std::string filename = "output/chromatic_transformation.avi";
|
std::string filename = "output/chromatic_transformation.avi";
|
||||||
|
std::cout << "Attempting to save AVI file: " << filename << std::endl;
|
||||||
|
std::cout << "Frames to save: " << frames.size() << std::endl;
|
||||||
|
std::cout << "Frame dimensions: " << width << "x" << height << std::endl;
|
||||||
|
|
||||||
bool success = AVIWriter::saveAVI(filename, frames, width, height, 30.0f);
|
bool success = AVIWriter::saveAVI(filename, frames, width, height, 30.0f);
|
||||||
|
|
||||||
if (success) {
|
if (success) {
|
||||||
@@ -134,6 +150,16 @@ int main() {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
std::cerr << "Failed to save AVI file!" << std::endl;
|
std::cerr << "Failed to save AVI file!" << std::endl;
|
||||||
|
|
||||||
|
// Additional debugging information
|
||||||
|
std::cerr << "Debug info:" << std::endl;
|
||||||
|
std::cerr << " - Frames count: " << frames.size() << std::endl;
|
||||||
|
if (!frames.empty()) {
|
||||||
|
std::cerr << " - First frame size: " << frames[0].size() << std::endl;
|
||||||
|
std::cerr << " - Expected frame size: " << width * height * 3 << std::endl;
|
||||||
|
}
|
||||||
|
std::cerr << " - Width: " << width << ", Height: " << height << std::endl;
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -204,8 +204,8 @@ public:
|
|||||||
getBoundingBox(minCorner, maxCorner);
|
getBoundingBox(minCorner, maxCorner);
|
||||||
|
|
||||||
// Calculate grid dimensions (adding 1 to include both ends)
|
// Calculate grid dimensions (adding 1 to include both ends)
|
||||||
width = static_cast<int>(std::ceil(maxCorner.x - minCorner.x)) + 1;
|
width = static_cast<int>(std::ceil(maxCorner.x - minCorner.x)) ;
|
||||||
height = static_cast<int>(std::ceil(maxCorner.y - minCorner.y)) + 1;
|
height = static_cast<int>(std::ceil(maxCorner.y - minCorner.y)) ;
|
||||||
|
|
||||||
// Initialize with black (0,0,0)
|
// Initialize with black (0,0,0)
|
||||||
rgbData.resize(width * height * 3, 0);
|
rgbData.resize(width * height * 3, 0);
|
||||||
|
|||||||
Reference in New Issue
Block a user