added videoio docs and tutorials

diff --git a/doc/tutorials/highgui/table_of_content_highgui.markdown b/doc/tutorials/highgui/table_of_content_highgui.markdown
index 3ff0e03..8f8b28f 100644 (file)
--- a/doc/tutorials/highgui/table_of_content_highgui.markdown
+++ b/doc/tutorials/highgui/table_of_content_highgui.markdown
@@ -12,24 +12,6 @@ use the built-in graphical user interface of the library.
 
     We will learn how to add a Trackbar to our applications
 
--   @subpage tutorial_video_input_psnr_ssim
-
-    *Compatibility:* \> OpenCV 2.0
-
-    *Author:* Bernát Gábor
-
-    You will learn how to read video streams, and how to calculate similarity values such as PSNR
-    or SSIM.
-
--   @subpage tutorial_video_write
-
-    *Compatibility:* \> OpenCV 2.0
-
-    *Author:* Bernát Gábor
-
-    Whenever you work with video feeds you may eventually want to save your image processing
-    result in a form of a new video file. Here's how to do it.
-
 -   @subpage tutorial_raster_io_gdal
 
     *Compatibility:* \> OpenCV 2.0

diff --git a/doc/tutorials/tutorials.markdown b/doc/tutorials/tutorials.markdown
index 552420c..035c69a 100644 (file)
--- a/doc/tutorials/tutorials.markdown
+++ b/doc/tutorials/tutorials.markdown
@@ -71,6 +71,10 @@ As always, we would be happy to hear your comments and receive your contribution
 
     Run OpenCV and your vision apps on an iDevice
 
+-   @subpage tutorial_table_of_content_videoio
+
+    These tutorials show how to read and write videos using videio module.
+
 -   @subpage tutorial_table_of_content_viz
 
     These tutorials show how to use Viz module effectively.

diff --git a/doc/tutorials/highgui/images/video-input-psnr-ssim.png b/doc/tutorials/videoio/images/video-input-psnr-ssim.png
similarity index 100%
rename from doc/tutorials/highgui/images/video-input-psnr-ssim.png
rename to doc/tutorials/videoio/images/video-input-psnr-ssim.png

diff --git a/doc/tutorials/highgui/images/video-write.png b/doc/tutorials/videoio/images/video-write.png
similarity index 100%
rename from doc/tutorials/highgui/images/video-write.png
rename to doc/tutorials/videoio/images/video-write.png

diff --git a/doc/tutorials/videoio/table_of_content_videoio.markdown b/doc/tutorials/videoio/table_of_content_videoio.markdown
new file mode 100644 (file)
index 0000000..b1b669d
--- /dev/null
+++ b/doc/tutorials/videoio/table_of_content_videoio.markdown
@@ -0,0 +1,19 @@
+Video Input and Output (videoio module) {#tutorial_table_of_content_videoio}
+=========================================
+
+This section contains tutorials about how to read/save your video files.
+
+-   @subpage tutorial_video_input_psnr_ssim
+
+    *Compatibility:* \> OpenCV 2.0
+
+    *Author:* Bernát Gábor
+
+    You will learn how to read video streams, and how to calculate similarity values such as PSNR
+    or SSIM.
+
+-   @subpage tutorial_video_write
+
+    *Compatibility:* \> OpenCV 2.0
+
+    *Author:* Bernát Gábor
\ No newline at end of file

diff --git a/doc/tutorials/highgui/video-input-psnr-ssim/images/outputVideoInput.png b/doc/tutorials/videoio/video-input-psnr-ssim/images/outputVideoInput.png
similarity index 100%
rename from doc/tutorials/highgui/video-input-psnr-ssim/images/outputVideoInput.png
rename to doc/tutorials/videoio/video-input-psnr-ssim/images/outputVideoInput.png

diff --git a/doc/tutorials/highgui/video-input-psnr-ssim/video_input_psnr_ssim.markdown b/doc/tutorials/videoio/video-input-psnr-ssim/video_input_psnr_ssim.markdown
similarity index 97%
rename from doc/tutorials/highgui/video-input-psnr-ssim/video_input_psnr_ssim.markdown
rename to doc/tutorials/videoio/video-input-psnr-ssim/video_input_psnr_ssim.markdown
index 1e61a87..ef82b67 100644 (file)
--- a/doc/tutorials/highgui/video-input-psnr-ssim/video_input_psnr_ssim.markdown
+++ b/doc/tutorials/videoio/video-input-psnr-ssim/video_input_psnr_ssim.markdown
@@ -20,12 +20,12 @@ As a test case where to show off these using OpenCV I've created a small program
 video files and performs a similarity check between them. This is something you could use to check
 just how well a new video compressing algorithms works. Let there be a reference (original) video
 like [this small Megamind clip
-](https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video/Megamind.avi) and [a compressed
-version of it ](https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video/Megamind_bugy.avi).
+](https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/videoio/video-input-psnr-ssim/video/Megamind.avi) and [a compressed
+version of it ](https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/videoio/video-input-psnr-ssim/video/Megamind_bugy.avi).
 You may also find the source code and these video file in the
-`samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/` folder of the OpenCV source library.
+`samples/cpp/tutorial_code/videoio/video-input-psnr-ssim/` folder of the OpenCV source library.
 
-@include cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video-input-psnr-ssim.cpp
+@include cpp/tutorial_code/videoio/video-input-psnr-ssim/video-input-psnr-ssim.cpp
 
 How to read a video stream (online-camera or offline-file)?
 -----------------------------------------------------------

diff --git a/doc/tutorials/highgui/video-write/images/resultOutputWideoWrite.png b/doc/tutorials/videoio/video-write/images/resultOutputWideoWrite.png
similarity index 100%
rename from doc/tutorials/highgui/video-write/images/resultOutputWideoWrite.png
rename to doc/tutorials/videoio/video-write/images/resultOutputWideoWrite.png

diff --git a/doc/tutorials/highgui/video-write/images/videoCompressSelect.png b/doc/tutorials/videoio/video-write/images/videoCompressSelect.png
similarity index 100%
rename from doc/tutorials/highgui/video-write/images/videoCompressSelect.png
rename to doc/tutorials/videoio/video-write/images/videoCompressSelect.png

diff --git a/doc/tutorials/highgui/video-write/images/videoFileStructure.png b/doc/tutorials/videoio/video-write/images/videoFileStructure.png
similarity index 100%
rename from doc/tutorials/highgui/video-write/images/videoFileStructure.png
rename to doc/tutorials/videoio/video-write/images/videoFileStructure.png

diff --git a/doc/tutorials/highgui/video-write/video_write.markdown b/doc/tutorials/videoio/video-write/video_write.markdown
similarity index 97%
rename from doc/tutorials/highgui/video-write/video_write.markdown
rename to doc/tutorials/videoio/video-write/video_write.markdown
index d10f6d0..399ac7a 100644 (file)
--- a/doc/tutorials/highgui/video-write/video_write.markdown
+++ b/doc/tutorials/videoio/video-write/video_write.markdown
@@ -30,10 +30,10 @@ The source code
 ---------------
 
 You may also find the source code and these video file in the
-`samples/cpp/tutorial_code/highgui/video-write/` folder of the OpenCV source library or [download it
-from here ](https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/HighGUI/video-write/video-write.cpp).
+`samples/cpp/tutorial_code/videoio/video-write/` folder of the OpenCV source library or [download it
+from here ](https://github.com/Itseez/opencv/tree/master/samples/cpp/tutorial_code/videoio/video-write/video-write.cpp).
 
-@include cpp/tutorial_code/HighGUI/video-write/video-write.cpp
+@include cpp/tutorial_code/videoio/video-write/video-write.cpp
 
 The structure of a video
 ------------------------

diff --git a/samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video-input-psnr-ssim.cpp b/samples/cpp/tutorial_code/videoio/video-input-psnr-ssim/video-input-psnr-ssim.cpp
similarity index 100%
rename from samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video-input-psnr-ssim.cpp
rename to samples/cpp/tutorial_code/videoio/video-input-psnr-ssim/video-input-psnr-ssim.cpp

diff --git a/samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video/Megamind.avi b/samples/cpp/tutorial_code/videoio/video-input-psnr-ssim/video/Megamind.avi
similarity index 100%
rename from samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video/Megamind.avi
rename to samples/cpp/tutorial_code/videoio/video-input-psnr-ssim/video/Megamind.avi

diff --git a/samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video/Megamind_bugy.avi b/samples/cpp/tutorial_code/videoio/video-input-psnr-ssim/video/Megamind_bugy.avi
similarity index 100%
rename from samples/cpp/tutorial_code/HighGUI/video-input-psnr-ssim/video/Megamind_bugy.avi
rename to samples/cpp/tutorial_code/videoio/video-input-psnr-ssim/video/Megamind_bugy.avi

diff --git a/samples/cpp/tutorial_code/HighGUI/video-write/video-write.cpp b/samples/cpp/tutorial_code/videoio/video-write/video-write.cpp
similarity index 100%
rename from samples/cpp/tutorial_code/HighGUI/video-write/video-write.cpp
rename to samples/cpp/tutorial_code/videoio/video-write/video-write.cpp