Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

Start a nNew thread

olena: branch exp/TL updated: olena-2.0-901-gb32346d

by git＠lrde.epita.fr

9 years, 5 months

olena: olena-2.0-901-gb32346d mln/binarization/tmms_hysteresis.hh: Fix include.

by Jonathan Fabrizio

--- milena/mln/binarization/tmms_hysteresis.hh | 1 + 1 file changed, 1 insertion(+) diff --git a/milena/mln/binarization/tmms_hysteresis.hh b/milena/mln/binarization/tmms_hysteresis.hh index 36a7cf9..362468b 100644 --- a/milena/mln/binarization/tmms_hysteresis.hh +++ b/milena/mln/binarization/tmms_hysteresis.hh @@ -37,6 +37,7 @@ #include <mln/morpho/dilation.hh> #include <mln/morpho/erosion.hh> #include <mln/labeling/blobs.hh> +#include <mln/core/image/image2d.hh> namespace mln { -- 1.7.10.4

9 years, 5 months

olena: branch exp/newdoc updated: olena-2.0-618-gaab2c29

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/newdoc has been updated via aab2c294904b925c437aa5b45944f688e8c4e947 (commit) from 6b25e2661de9de9b528528f78cb61afd7aa3acd1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- aab2c29 Add section Conversion of RGB Images in examples part. ----------------------------------------------------------------------- Summary of changes: milena/doc/examples.dox | 8 +++++++ milena/doc/examples/cv_to_mln.cc | 22 ++++++++++++++++++++ milena/doc/examples/ffmpeg_to_mln.cc | 28 +++++++++++++++++++++++++ milena/doc/examples/mln_to_cv.cc | 23 ++++++++++++++++++++ milena/doc/examples/mln_to_ffmpeg.cc | 38 ++++++++++++++++++++++++++++++++++ 5 files changed, 119 insertions(+) create mode 100644 milena/doc/examples/cv_to_mln.cc create mode 100644 milena/doc/examples/ffmpeg_to_mln.cc create mode 100644 milena/doc/examples/mln_to_cv.cc create mode 100644 milena/doc/examples/mln_to_ffmpeg.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

9 years, 7 months

olena: olena-2.0-618-gaab2c29 Add section Conversion of RGB Images in examples part.

by myriam robert-seidowsky

* src/milena/doc/examples.dox, * src/milena/doc/examples/cv_to_mln.cc, * src/milena/doc/examples/ffmpeg_to_mln.cc, * src/milena/doc/examples/mln_to_cv.cc, * src/milena/doc/examples/mln_to_ffmpeg.cc: Here. --- milena/doc/examples.dox | 8 +++++++ milena/doc/examples/cv_to_mln.cc | 22 ++++++++++++++++++++ milena/doc/examples/ffmpeg_to_mln.cc | 28 +++++++++++++++++++++++++ milena/doc/examples/mln_to_cv.cc | 23 ++++++++++++++++++++ milena/doc/examples/mln_to_ffmpeg.cc | 38 ++++++++++++++++++++++++++++++++++ 5 files changed, 119 insertions(+) create mode 100644 milena/doc/examples/cv_to_mln.cc create mode 100644 milena/doc/examples/ffmpeg_to_mln.cc create mode 100644 milena/doc/examples/mln_to_cv.cc create mode 100644 milena/doc/examples/mln_to_ffmpeg.cc diff --git a/milena/doc/examples.dox b/milena/doc/examples.dox index e81f600..d55e624 100644 --- a/milena/doc/examples.dox +++ b/milena/doc/examples.dox @@ -20,5 +20,13 @@ \section exampleswin Windows \li \link doc/examples/window_iterator.cc Iteration w.r.t. a window \endlink + +\section examplesconv Conversion of RGB Images +\subsection Opencv +\li \link doc/examples/mln_to_cv.cc Milena to Opencv. \endlink +\li \link doc/examples/cv_to_mln.cc Opencv to Milena. \endlink +\subsection FFmpeg +\li \link doc/examples/mln_to_ffmpeg.cc Milena to FFmpeg. \endlink +\li \link doc/examples/ffmpeg_to_mln.cc FFmpeg to Milena. \endlink */ diff --git a/milena/doc/examples/cv_to_mln.cc b/milena/doc/examples/cv_to_mln.cc new file mode 100644 index 0000000..878e6e8 --- /dev/null +++ b/milena/doc/examples/cv_to_mln.cc @@ -0,0 +1,22 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +#include "opencv/highgui.h" +#include "opencv2/imgproc/imgproc.hpp" + +using namespace cv; +using namespace mln; +using value::rgb8; + +image2d<value::rgb8> opencv_to_milena(cv::Mat cv_img) { + + image2d<value::rgb8> mln_img(cv_img.rows, cv_img.cols); + + for (unsigned x = 0; x < mln_img.ncols(); ++x) { + for (unsigned y = 0; y < mln_img.nrows(); ++y) { + mln_img(mln::point2d(y, x)).red() = cv_img.at<Vec3b>(y, x).val[2]; + mln_img(mln::point2d(y, x)).green() = cv_img.at<Vec3b>(y, x).val[1]; + mln_img(mln::point2d(y, x)).blue() = cv_img.at<Vec3b>(y, x).val[0]; + } + } + return mln_img; +} diff --git a/milena/doc/examples/ffmpeg_to_mln.cc b/milena/doc/examples/ffmpeg_to_mln.cc new file mode 100644 index 0000000..eb86dd8 --- /dev/null +++ b/milena/doc/examples/ffmpeg_to_mln.cc @@ -0,0 +1,28 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +extern "C" { + +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> +#include <libavutil/avutil.h> +#include <libavutil/imgutils.h> +#include <libswscale/swscale.h> + +} + +image2d<value::rgb8> copy_AvFrame_to_image2d_rgb(AVFrame *ffmpeg_img) { + + image2d<value::rgb8> mln_img(ffmpeg_img->height, ffmpeg_img->width); + + value::rgb8 *img_mln_ptr = &mln_img(mln_img.domain().pmin()); + unsigned img_mln_nextline = mln_img.delta_offset(dpoint2d(+1, 0)); + unsigned nrows = geom::nrows(mln_img); + uint8_t *img_ffmpeg_ptr = ffmpeg_img->data[0]; + + for (unsigned int row = 0; row < nrows; ++row) { + std::memcpy(img_mln_ptr, img_ffmpeg_ptr, ffmpeg_img->width * 3); + img_mln_ptr += img_mln_nextline; + img_ffmpeg_ptr += ffmpeg_img->linesize[0]; + } + return mln_img; +} diff --git a/milena/doc/examples/mln_to_cv.cc b/milena/doc/examples/mln_to_cv.cc new file mode 100644 index 0000000..501de14 --- /dev/null +++ b/milena/doc/examples/mln_to_cv.cc @@ -0,0 +1,23 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +#include "opencv/highgui.h" +#include "opencv2/imgproc/imgproc.hpp" + +using namespace cv; +using namespace mln; +using value::rgb8; + +cv::Mat milena_to_opencv(image2d<value::rgb8> mln_img) { + + cv::Mat cv_img(mln_img.nrows(), mln_img.ncols(), CV_8UC3); + + for (unsigned x = 0; x < mln_img.ncols(); ++x) { + for (unsigned y = 0; y < mln_img.nrows(); ++y) { + Vec3b intensity(mln_img(mln::point2d(y, x)).blue(), + mln_img(mln::point2d(y, x)).green(), + mln_img(mln::point2d(y, x)).red()); + cv_img.at<Vec3b>(y, x) = intensity; + } + } + return cv_img; +} diff --git a/milena/doc/examples/mln_to_ffmpeg.cc b/milena/doc/examples/mln_to_ffmpeg.cc new file mode 100644 index 0000000..1187c69 --- /dev/null +++ b/milena/doc/examples/mln_to_ffmpeg.cc @@ -0,0 +1,38 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +extern "C" { + +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> +#include <libavutil/avutil.h> +#include <libavutil/imgutils.h> +#include <libswscale/swscale.h> + +} + +AVFrame* copy_image2d_rgb_to_AvFame(image2d<value::rgb8> mln_img) { + + int w = mln_img.ncols(); + int h = mln_img.nrows(); + + AVFrame *ffmpeg_img; + ffmpeg_img = avcodec_alloc_frame(); + + ffmpeg_img->linesize[0] = w * 3; + ffmpeg_img->width = w; + av_image_alloc(ffmpeg_img->data, ffmpeg_img->linesize, w, h, PIX_FMT_RGB24, 1); + + uint8_t *img_ffmpeg_ptr = ffmpeg_img->data[0]; + + value::rgb8 *img_mln_ptr = &mln_img(mln_img.domain().pmin()); + unsigned img_mln_nextline = mln_img.delta_offset(dpoint2d(+1, 0)); + unsigned nrows = ffmpeg_img->height = h; + + for (unsigned int row = 0; row < nrows; ++row) { + std::memcpy(img_ffmpeg_ptr, img_mln_ptr, w * 3); + img_mln_ptr += img_mln_nextline; + img_ffmpeg_ptr += ffmpeg_img->linesize[0]; + } + + return ffmpeg_img; +} -- 1.7.10.4

9 years, 7 months

olena: branch next updated: olena-2.1-3-g410a168

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 410a168903b97afaa78f07513e8b1b2a8cded983 (commit) from f42c4db604ddf1096dc377130eb9dfa0138704df (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 410a168 Add section Conversion of RGB Images in examples part. ----------------------------------------------------------------------- Summary of changes: milena/doc/examples.dox | 12 ++++++++++- milena/doc/examples/cv_to_mln.cc | 22 ++++++++++++++++++++ milena/doc/examples/ffmpeg_to_mln.cc | 28 +++++++++++++++++++++++++ milena/doc/examples/mln_to_cv.cc | 23 ++++++++++++++++++++ milena/doc/examples/mln_to_ffmpeg.cc | 38 ++++++++++++++++++++++++++++++++++ 5 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 milena/doc/examples/cv_to_mln.cc create mode 100644 milena/doc/examples/ffmpeg_to_mln.cc create mode 100644 milena/doc/examples/mln_to_cv.cc create mode 100644 milena/doc/examples/mln_to_ffmpeg.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

9 years, 7 months

olena: branch exp/TL updated: olena-2.0-900-g8466498

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/TL has been updated via 846649885e5e64b0bcf894f6f2c95893c4d07e76 (commit) from ef5214a87f7e28765dba06e9f395cee87141a223 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 8466498 Add section Conversion of RGB Images in examples part. ----------------------------------------------------------------------- Summary of changes: milena/doc/examples.dox | 7 +++++++ milena/doc/examples/cv_to_mln.cc | 22 ++++++++++++++++++++ milena/doc/examples/ffmpeg_to_mln.cc | 28 +++++++++++++++++++++++++ milena/doc/examples/mln_to_cv.cc | 23 ++++++++++++++++++++ milena/doc/examples/mln_to_ffmpeg.cc | 38 ++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+) create mode 100644 milena/doc/examples/cv_to_mln.cc create mode 100644 milena/doc/examples/ffmpeg_to_mln.cc create mode 100644 milena/doc/examples/mln_to_cv.cc create mode 100644 milena/doc/examples/mln_to_ffmpeg.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

9 years, 7 months

olena: olena-2.1-3-g410a168 Add section Conversion of RGB Images in examples part.

by myriam robert-seidowsky

* src/milena/doc/examples.dox, * src/milena/doc/examples/cv_to_mln.cc, * src/milena/doc/examples/ffmpeg_to_mln.cc, * src/milena/doc/examples/mln_to_cv.cc, * src/milena/doc/examples/mln_to_ffmpeg.cc: Here. --- milena/doc/examples.dox | 12 ++++++++++- milena/doc/examples/cv_to_mln.cc | 22 ++++++++++++++++++++ milena/doc/examples/ffmpeg_to_mln.cc | 28 +++++++++++++++++++++++++ milena/doc/examples/mln_to_cv.cc | 23 ++++++++++++++++++++ milena/doc/examples/mln_to_ffmpeg.cc | 38 ++++++++++++++++++++++++++++++++++ 5 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 milena/doc/examples/cv_to_mln.cc create mode 100644 milena/doc/examples/ffmpeg_to_mln.cc create mode 100644 milena/doc/examples/mln_to_cv.cc create mode 100644 milena/doc/examples/mln_to_ffmpeg.cc diff --git a/milena/doc/examples.dox b/milena/doc/examples.dox index ab18c38..69d6093 100644 --- a/milena/doc/examples.dox +++ b/milena/doc/examples.dox @@ -7,8 +7,18 @@ \li \link demos/genericity/neighborhood/permissive.cc Custom neighborhoods \endlink \li \link demos/inter_pixel/inter_pixel.cc Inter-pixel processings \endlink - \section examplesgraph Graphs \li \link demos/graph/region_adjacency_graph.cc Region Adjacency Graph \endlink + +\section examplesinterpixel Inter-pixel Processings +\li \link demos/inter_pixel/inter_pixel.cc Watershed \endlink + +\section examplesconv Conversion of RGB Images +\subsection Opencv +\li \link doc/examples/mln_to_cv.cc Milena to Opencv. \endlink +\li \link doc/examples/cv_to_mln.cc Opencv to Milena. \endlink +\subsection FFmpeg +\li \link doc/examples/mln_to_ffmpeg.cc Milena to FFmpeg. \endlink +\li \link doc/examples/ffmpeg_to_mln.cc FFmpeg to Milena. \endlink */ diff --git a/milena/doc/examples/cv_to_mln.cc b/milena/doc/examples/cv_to_mln.cc new file mode 100644 index 0000000..878e6e8 --- /dev/null +++ b/milena/doc/examples/cv_to_mln.cc @@ -0,0 +1,22 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +#include "opencv/highgui.h" +#include "opencv2/imgproc/imgproc.hpp" + +using namespace cv; +using namespace mln; +using value::rgb8; + +image2d<value::rgb8> opencv_to_milena(cv::Mat cv_img) { + + image2d<value::rgb8> mln_img(cv_img.rows, cv_img.cols); + + for (unsigned x = 0; x < mln_img.ncols(); ++x) { + for (unsigned y = 0; y < mln_img.nrows(); ++y) { + mln_img(mln::point2d(y, x)).red() = cv_img.at<Vec3b>(y, x).val[2]; + mln_img(mln::point2d(y, x)).green() = cv_img.at<Vec3b>(y, x).val[1]; + mln_img(mln::point2d(y, x)).blue() = cv_img.at<Vec3b>(y, x).val[0]; + } + } + return mln_img; +} diff --git a/milena/doc/examples/ffmpeg_to_mln.cc b/milena/doc/examples/ffmpeg_to_mln.cc new file mode 100644 index 0000000..eb86dd8 --- /dev/null +++ b/milena/doc/examples/ffmpeg_to_mln.cc @@ -0,0 +1,28 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +extern "C" { + +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> +#include <libavutil/avutil.h> +#include <libavutil/imgutils.h> +#include <libswscale/swscale.h> + +} + +image2d<value::rgb8> copy_AvFrame_to_image2d_rgb(AVFrame *ffmpeg_img) { + + image2d<value::rgb8> mln_img(ffmpeg_img->height, ffmpeg_img->width); + + value::rgb8 *img_mln_ptr = &mln_img(mln_img.domain().pmin()); + unsigned img_mln_nextline = mln_img.delta_offset(dpoint2d(+1, 0)); + unsigned nrows = geom::nrows(mln_img); + uint8_t *img_ffmpeg_ptr = ffmpeg_img->data[0]; + + for (unsigned int row = 0; row < nrows; ++row) { + std::memcpy(img_mln_ptr, img_ffmpeg_ptr, ffmpeg_img->width * 3); + img_mln_ptr += img_mln_nextline; + img_ffmpeg_ptr += ffmpeg_img->linesize[0]; + } + return mln_img; +} diff --git a/milena/doc/examples/mln_to_cv.cc b/milena/doc/examples/mln_to_cv.cc new file mode 100644 index 0000000..501de14 --- /dev/null +++ b/milena/doc/examples/mln_to_cv.cc @@ -0,0 +1,23 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +#include "opencv/highgui.h" +#include "opencv2/imgproc/imgproc.hpp" + +using namespace cv; +using namespace mln; +using value::rgb8; + +cv::Mat milena_to_opencv(image2d<value::rgb8> mln_img) { + + cv::Mat cv_img(mln_img.nrows(), mln_img.ncols(), CV_8UC3); + + for (unsigned x = 0; x < mln_img.ncols(); ++x) { + for (unsigned y = 0; y < mln_img.nrows(); ++y) { + Vec3b intensity(mln_img(mln::point2d(y, x)).blue(), + mln_img(mln::point2d(y, x)).green(), + mln_img(mln::point2d(y, x)).red()); + cv_img.at<Vec3b>(y, x) = intensity; + } + } + return cv_img; +} diff --git a/milena/doc/examples/mln_to_ffmpeg.cc b/milena/doc/examples/mln_to_ffmpeg.cc new file mode 100644 index 0000000..1187c69 --- /dev/null +++ b/milena/doc/examples/mln_to_ffmpeg.cc @@ -0,0 +1,38 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +extern "C" { + +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> +#include <libavutil/avutil.h> +#include <libavutil/imgutils.h> +#include <libswscale/swscale.h> + +} + +AVFrame* copy_image2d_rgb_to_AvFame(image2d<value::rgb8> mln_img) { + + int w = mln_img.ncols(); + int h = mln_img.nrows(); + + AVFrame *ffmpeg_img; + ffmpeg_img = avcodec_alloc_frame(); + + ffmpeg_img->linesize[0] = w * 3; + ffmpeg_img->width = w; + av_image_alloc(ffmpeg_img->data, ffmpeg_img->linesize, w, h, PIX_FMT_RGB24, 1); + + uint8_t *img_ffmpeg_ptr = ffmpeg_img->data[0]; + + value::rgb8 *img_mln_ptr = &mln_img(mln_img.domain().pmin()); + unsigned img_mln_nextline = mln_img.delta_offset(dpoint2d(+1, 0)); + unsigned nrows = ffmpeg_img->height = h; + + for (unsigned int row = 0; row < nrows; ++row) { + std::memcpy(img_ffmpeg_ptr, img_mln_ptr, w * 3); + img_mln_ptr += img_mln_nextline; + img_ffmpeg_ptr += ffmpeg_img->linesize[0]; + } + + return ffmpeg_img; +} -- 1.7.10.4

9 years, 7 months

olena: olena-2.0-900-g8466498 Add section Conversion of RGB Images in examples part.

by myriam robert-seidowsky

* src/milena/doc/examples.dox, * src/milena/doc/examples/cv_to_mln.cc, * src/milena/doc/examples/ffmpeg_to_mln.cc, * src/milena/doc/examples/mln_to_cv.cc, * src/milena/doc/examples/mln_to_ffmpeg.cc: Here. --- milena/doc/examples.dox | 7 +++++++ milena/doc/examples/cv_to_mln.cc | 22 ++++++++++++++++++++ milena/doc/examples/ffmpeg_to_mln.cc | 28 +++++++++++++++++++++++++ milena/doc/examples/mln_to_cv.cc | 23 ++++++++++++++++++++ milena/doc/examples/mln_to_ffmpeg.cc | 38 ++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+) create mode 100644 milena/doc/examples/cv_to_mln.cc create mode 100644 milena/doc/examples/ffmpeg_to_mln.cc create mode 100644 milena/doc/examples/mln_to_cv.cc create mode 100644 milena/doc/examples/mln_to_ffmpeg.cc diff --git a/milena/doc/examples.dox b/milena/doc/examples.dox index 3a10c8a..a11e402 100644 --- a/milena/doc/examples.dox +++ b/milena/doc/examples.dox @@ -17,4 +17,11 @@ \section examplesinterpixel Inter-pixel Processings \li \link demos/inter_pixel/inter_pixel.cc Watershed \endlink +\section examplesconv Conversion of RGB Images +\subsection Opencv +\li \link doc/examples/mln_to_cv.cc Milena to Opencv. \endlink +\li \link doc/examples/cv_to_mln.cc Opencv to Milena. \endlink +\subsection FFmpeg +\li \link doc/examples/mln_to_ffmpeg.cc Milena to FFmpeg. \endlink +\li \link doc/examples/ffmpeg_to_mln.cc FFmpeg to Milena. \endlink */ diff --git a/milena/doc/examples/cv_to_mln.cc b/milena/doc/examples/cv_to_mln.cc new file mode 100644 index 0000000..878e6e8 --- /dev/null +++ b/milena/doc/examples/cv_to_mln.cc @@ -0,0 +1,22 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +#include "opencv/highgui.h" +#include "opencv2/imgproc/imgproc.hpp" + +using namespace cv; +using namespace mln; +using value::rgb8; + +image2d<value::rgb8> opencv_to_milena(cv::Mat cv_img) { + + image2d<value::rgb8> mln_img(cv_img.rows, cv_img.cols); + + for (unsigned x = 0; x < mln_img.ncols(); ++x) { + for (unsigned y = 0; y < mln_img.nrows(); ++y) { + mln_img(mln::point2d(y, x)).red() = cv_img.at<Vec3b>(y, x).val[2]; + mln_img(mln::point2d(y, x)).green() = cv_img.at<Vec3b>(y, x).val[1]; + mln_img(mln::point2d(y, x)).blue() = cv_img.at<Vec3b>(y, x).val[0]; + } + } + return mln_img; +} diff --git a/milena/doc/examples/ffmpeg_to_mln.cc b/milena/doc/examples/ffmpeg_to_mln.cc new file mode 100644 index 0000000..eb86dd8 --- /dev/null +++ b/milena/doc/examples/ffmpeg_to_mln.cc @@ -0,0 +1,28 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +extern "C" { + +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> +#include <libavutil/avutil.h> +#include <libavutil/imgutils.h> +#include <libswscale/swscale.h> + +} + +image2d<value::rgb8> copy_AvFrame_to_image2d_rgb(AVFrame *ffmpeg_img) { + + image2d<value::rgb8> mln_img(ffmpeg_img->height, ffmpeg_img->width); + + value::rgb8 *img_mln_ptr = &mln_img(mln_img.domain().pmin()); + unsigned img_mln_nextline = mln_img.delta_offset(dpoint2d(+1, 0)); + unsigned nrows = geom::nrows(mln_img); + uint8_t *img_ffmpeg_ptr = ffmpeg_img->data[0]; + + for (unsigned int row = 0; row < nrows; ++row) { + std::memcpy(img_mln_ptr, img_ffmpeg_ptr, ffmpeg_img->width * 3); + img_mln_ptr += img_mln_nextline; + img_ffmpeg_ptr += ffmpeg_img->linesize[0]; + } + return mln_img; +} diff --git a/milena/doc/examples/mln_to_cv.cc b/milena/doc/examples/mln_to_cv.cc new file mode 100644 index 0000000..501de14 --- /dev/null +++ b/milena/doc/examples/mln_to_cv.cc @@ -0,0 +1,23 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +#include "opencv/highgui.h" +#include "opencv2/imgproc/imgproc.hpp" + +using namespace cv; +using namespace mln; +using value::rgb8; + +cv::Mat milena_to_opencv(image2d<value::rgb8> mln_img) { + + cv::Mat cv_img(mln_img.nrows(), mln_img.ncols(), CV_8UC3); + + for (unsigned x = 0; x < mln_img.ncols(); ++x) { + for (unsigned y = 0; y < mln_img.nrows(); ++y) { + Vec3b intensity(mln_img(mln::point2d(y, x)).blue(), + mln_img(mln::point2d(y, x)).green(), + mln_img(mln::point2d(y, x)).red()); + cv_img.at<Vec3b>(y, x) = intensity; + } + } + return cv_img; +} diff --git a/milena/doc/examples/mln_to_ffmpeg.cc b/milena/doc/examples/mln_to_ffmpeg.cc new file mode 100644 index 0000000..1187c69 --- /dev/null +++ b/milena/doc/examples/mln_to_ffmpeg.cc @@ -0,0 +1,38 @@ +#include <mln/core/image/image2d.hh> +#include <mln/value/rgb8.hh> +extern "C" { + +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> +#include <libavutil/avutil.h> +#include <libavutil/imgutils.h> +#include <libswscale/swscale.h> + +} + +AVFrame* copy_image2d_rgb_to_AvFame(image2d<value::rgb8> mln_img) { + + int w = mln_img.ncols(); + int h = mln_img.nrows(); + + AVFrame *ffmpeg_img; + ffmpeg_img = avcodec_alloc_frame(); + + ffmpeg_img->linesize[0] = w * 3; + ffmpeg_img->width = w; + av_image_alloc(ffmpeg_img->data, ffmpeg_img->linesize, w, h, PIX_FMT_RGB24, 1); + + uint8_t *img_ffmpeg_ptr = ffmpeg_img->data[0]; + + value::rgb8 *img_mln_ptr = &mln_img(mln_img.domain().pmin()); + unsigned img_mln_nextline = mln_img.delta_offset(dpoint2d(+1, 0)); + unsigned nrows = ffmpeg_img->height = h; + + for (unsigned int row = 0; row < nrows; ++row) { + std::memcpy(img_ffmpeg_ptr, img_mln_ptr, w * 3); + img_mln_ptr += img_mln_nextline; + img_ffmpeg_ptr += ffmpeg_img->linesize[0]; + } + + return ffmpeg_img; +} -- 1.7.10.4

9 years, 7 months

olena: branch next updated: olena-2.1-2-gf42c4db

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via f42c4db604ddf1096dc377130eb9dfa0138704df (commit) via 58d4f5dfe6dbf87289d20b9ce675d50bae1cb74d (commit) from 877187bac1da8b18265d80051282fac77d4b7709 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- f42c4db configure.ac, NEWS: Version 2.1a. ----------------------------------------------------------------------- Summary of changes: ANNOUNCE-2.1 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ChangeLog | 4 ++++ NEWS | 3 +++ configure.ac | 2 +- 4 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 ANNOUNCE-2.1 hooks/post-receive -- Olena, a generic and efficient image processing platform

9 years, 9 months

olena: branch master updated: olena-2.1-1-g58d4f5d

by git＠lrde.epita.fr

9 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches