srcrr
/
libdart_openmvg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactored code and start work on streaming.

This commit is contained in:
Jordan 2024-03-13 09:02:11 -07:00
parent 5d05c42411
commit cc317d0d24
9 changed files with 191 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/watch_compilelib.sh
View File

@ -10,5 +10,5 @@ DIR=$(cd -P "$(dirname "$SOURCE")" >/dev/null 2>&1 && pwd)
SRC_DIR=$(realpath ${DIR}/../src)
find ${SRC_DIR} -name "*.c*" -o -name "*.h" -o -name "CMakeLists.txt" | \
find ${SRC_DIR} -name "*.c*" -o -name "*.h*" -o -name "CMakeLists.txt" | \
entr -r ${DIR}/compilelib.sh

6
src/CMakeLists.txt
View File

@ -59,6 +59,8 @@ set(SKIP_INSTALL_ALL OFF CACHE BOOL "" FORCE) # we only want lib
add_definitions(${PNG_DEFINITIONS})
add_library(${LIBDART_OPENMVG} SHARED
"frame.cxx"
"streamingview.cxx"
"image.cxx"
)
@ -68,11 +70,9 @@ target_include_directories(
${FFMPEG_INCLUDE_DIRS}
${PNG_INCLUDE_DIRS}
${ARCHIMEDES_INCLUDE_DIRS}
${OPENMVG_INCLUDE_DIRS}/src
${OpenMVG_DIR}/../../../include/openMVG_dependencies/cereal/include/cereal/
)
# message("LIBRARIES:" ${OpenMVG_LIBRARIES})
target_link_libraries(
${LIBDART_OPENMVG}
cwalk

15
src/base.hpp Normal file
View File

@ -0,0 +1,15 @@
#ifdef __cplusplus
#define EXTC extern "C"
#define START_EXTC_GRP extern "C" {
#define END_EXTC_GRP }
#else
#define EXTC
#define START_EXTC_GRP
#define END_EXTC_GRP
#endif // _CPLUSPLUS
#ifdef __cplusplus
# define _FFI_PLUGIN extern "C" __attribute__((visibility("default"))) __attribute__((used))
#else
# define _FFI_PLUGIN __attribute__((visibility("default"))) __attribute__((used))
#endif // __cplusplus

38
src/frame.cxx Normal file
View File

@ -0,0 +1,38 @@
#include "frame.h"
const Frame *new_frame_from_handle(FILE *stream, int w, int h, int depth)
{
Frame *f = (Frame *)malloc(sizeof(Frame));
f->stream = stream;
f->w = w;
f->h = h;
f->depth = depth;
return f;
}
FILE *make_buffer(const uint8_t *data, const size_t data_len)
{
FILE *file = fmemopen((void *)data, data_len, "r+");
if (file == NULL)
{
perror("Error opening file");
return NULL;
}
// Seek to the beginning of the file
rewind(file);
// Write the data to the file
fwrite(data, sizeof(uint8_t), data_len, file);
return file;
}
_FFI_PLUGIN
const Frame *
new_frame_from_data(const uint8_t *data, const size_t data_len, int w, int h, int depth)
{
FILE *buf = make_buffer(data, data_len);
return new_frame_from_handle(buf, w, h, depth);
}

20
src/frame.h Normal file
View File

@ -0,0 +1,20 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include "./base.hpp"
typedef struct _Frame
{
FILE *stream;
int w;
int h;
int depth;
} Frame;
FILE *make_buffer(const uint8_t *, const size_t);
_FFI_PLUGIN
const Frame *new_frame_from_handle(FILE *, int, int, int);
_FFI_PLUGIN
const Frame *
new_frame_from_data(const uint8_t *, const size_t, int, int, int);

114
src/image.cxx
View File

@ -1,86 +1,67 @@
#include "./image.h"
#ifdef __cplusplus
#include <cereal/archives/binary.hpp>
#include <openMVG/image/image_io.hpp>
#include <openMVG/image/image_concat.hpp>
#include <openMVG/sfm/sfm_view.hpp>
#include <openMVG/sfm/sfm_view_io.hpp>
#include <Eigen/src/Core/util/Constants.h>
#endif // __ cplusplus
_FFI_PLUGIN
ImageResult *image_result_new(const u_char *data, const size_t data_len) {
ImageResult *r = (ImageResult *) malloc(sizeof(ImageResult));
r->data = (u_char *) calloc(sizeof(u_char), data_len);
memcpy(r->data, data, data_len * sizeof(u_char));
r->data_len = data_len;
r->error = 0;
return r;
ImageResult *image_result_new(const u_char *data, const size_t data_len)
{
ImageResult *r = (ImageResult *)malloc(sizeof(ImageResult));
r->data = (u_char *)calloc(sizeof(u_char), data_len);
memcpy(r->data, data, data_len * sizeof(u_char));
r->data_len = data_len;
r->error = 0;
return r;
}
_FFI_PLUGIN
ImageResult *image_result_new_error(const error_t err) {
ImageResult *r = (ImageResult *) malloc(sizeof(ImageResult));
r->data = NULL;
r->data_len = 0;
r->error = err;
return r;
ImageResult *image_result_new_error(const error_t err)
{
ImageResult *r = (ImageResult *)malloc(sizeof(ImageResult));
r->data = NULL;
r->data_len = 0;
r->error = err;
return r;
}
_FFI_PLUGIN
void free_image_result(ImageResult *image_result) {
free(image_result->data);
free(image_result);
void free_image_result(ImageResult *image_result)
{
free(image_result->data);
free(image_result);
}
const Frame *new_frame_from_handle(FILE *stream, int w, int h, int depth)
{
Frame *f = (Frame *)malloc(sizeof(Frame));
f->stream = stream;
f->w = w;
f->h = h;
f->depth = depth;
return f;
}
FILE *make_buffer(const uint8_t *data, const size_t data_len)
std::vector<u_char> Archimedes::get_image_data_as_vector(const Frame *frame)
{
FILE *file = fmemopen((void *)data, data_len, "r+");
if (file == NULL)
rewind(frame->stream);
std::vector<unsigned char> imageData;
if (!openMVG::image::ReadPngStream(frame->stream, &imageData, (int *)&(frame->w), (int *)&(frame->h), (int *)&(frame->depth)))
{
perror("Error opening file");
return NULL;
throw std::runtime_error("Could not read stream");
}
// Seek to the beginning of the file
rewind(file);
// Write the data to the file
fwrite(data, sizeof(uint8_t), data_len, file);
return file;
}
_FFI_PLUGIN
const Frame *
new_frame_from_data(const uint8_t *data, const size_t data_len, int w, int h, int depth)
{
FILE *buf = make_buffer(data, data_len);
return new_frame_from_handle(buf, w, h, depth);
return imageData;
}
#ifdef __cplusplus
extern "C"
ImageResult *Archimedes::get_image_data(const Frame *frame)
{
std::vector<unsigned char> imageData;
rewind(frame->stream);
if (!openMVG::image::ReadPngStream(frame->stream, &imageData, (int *)&(frame->w), (int *)&(frame->h), (int *)&(frame->depth))) {
printf("ERROR: Could not read stream!\n");
try {
const std::vector<u_char> imageData = get_image_data_as_vector(frame);
printf("Read %lu bytes.\n", imageData.size());
const unsigned char *data = imageData.data();
return image_result_new(data, imageData.size());
} catch (const std::runtime_error& e) {
std::cerr << e.what() << std::endl;
return image_result_new_error(1);
}
printf("Read %lu bytes.\n", imageData.size());
const unsigned char *data = imageData.data();
return image_result_new(data, imageData.size());
}
#endif
@ -91,10 +72,29 @@ ImageResult *archimedes_get_image_data(const Frame *frame)
return Archimedes::get_image_data(frame);
}
_FFI_PLUGIN
int Archimedes::images_to_sfm(const Frame **frames, size_t n_frames)
{
using namespace openMVG::sfm;
const Frame *frame = frames[0];
const std::vector<u_char> imageData = get_image_data_as_vector(frame);
const size_t w = frame->w;
const size_t h = frame->h;
// Create the Eigen matrix and the image
Eigen::Matrix<u_char, Eigen::Dynamic, Eigen::Dynamic, 1> eigenMatrix(w, h);
for (int i = 0; i < w * h; ++i) {
eigenMatrix(i / h, i % h) = imageData[i];
}
openMVG::image::Image bvgImage(eigenMatrix);
SfM_Data sfmData {};
sfmData.views = Views();
return 0;
}

41
src/image.h
View File

@ -29,17 +29,13 @@
#include <openMVG/sfm/pipelines/stellar/sfm_stellar_engine.hpp>
#endif // __cplusplus
#include "./base.hpp"
#include "frame.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <png.h>
#ifdef __cplusplus
# define _FFI_PLUGIN extern "C" __attribute__((visibility("default"))) __attribute__((used))
#else
# define _FFI_PLUGIN __attribute__((visibility("default"))) __attribute__((used))
#endif // __cplusplus
#if defined(__cplusplus)
extern "C" {
@ -48,15 +44,21 @@ extern "C" {
#endif // __cplusplus
#ifdef __cplusplus
typedef struct _Frame
{
FILE *stream;
int w;
int h;
int depth;
} Frame;
class StreamedView : openMVG::sfm::View {
private:
const Frame *mFrame;
public:
StreamedView(const Frame *);
};
#endif
typedef struct _ImageResult
{
@ -72,21 +74,12 @@ ImageResult *image_result_new_error(const error_t);
_FFI_PLUGIN
int image_result_free(ImageResult *);
_FFI_PLUGIN
const Frame *new_frame_from_handle(FILE *, int, int, int);
_FFI_PLUGIN
const Frame *
new_frame_from_data(const uint8_t *, const size_t, int, int, int);
#ifdef __cplusplus
typedef openMVG::image::Image<openMVG::image::RGBColor> RgbImage;
typedef std::vector<openMVG::features::AffinePointFeature> FeatureVector;
typedef openMVG::image::Image<unsigned char> UImage;
typedef std::vector<openMVG::features::MSER::MSERRegion> RegionVector;
typedef openMVG::sfm::SfM_Data Sfm_Data;
extern "C" namespace Archimedes
namespace Archimedes
{
std::vector<u_char> get_image_data_as_vector(const Frame *frame);
ImageResult *get_image_data(const Frame *);
int images_to_sfm(const Frame **, size_t);
}

15
src/streamingview.cxx Normal file
View File

@ -0,0 +1,15 @@
#include "streamingview.hpp"
template<class Archive>
void libdart_openmvg::StreamingView::load(cereal::BinaryOutputArchive &ar) const {
int i = 0;
while (i = fgetc(mFrame->stream) != EOF) {
ar(i);
}
}
template<class Archive>
void libdart_openmvg::StreamingView::save(cereal::BinaryInputArchive &ar) const {
// int i = 0;
// todo
}

25
src/streamingview.hpp Normal file
View File

@ -0,0 +1,25 @@
#include <archives/binary.hpp>
#include <openMVG/sfm/sfm_view.hpp>
#include <stdio.h>
#include "frame.h"
typedef openMVG::sfm::View View;
namespace libdart_openmvg
{
struct StreamingView : View
{
private:
const Frame *mFrame;
public:
StreamingView(const Frame *frame) : mFrame(frame), View () {}
template <class Archive>
void save(cereal::BinaryInputArchive &) const;
template <class Archive>
void load(cereal::BinaryOutputArchive &) const;
};
}