Commit 4c1fb008 authored by Xavier Weber's avatar Xavier Weber Committed by Alexander Alekhin
Browse files

Merge pull request #2231 from Saafke:dnn_superres_final_phase 

* Add learning-based super-resolution module

Adds the module plus loading classes for SR data

Complete with docs, tutorials and tests.

* Fix typo

* Small commit to restart buildbot

* Change refs from arXiv to official

* Remove video string

* dnn_superres: update perf test code

* dnn_superres: test fixup
parent dda33bf3

modules/README.md

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ $ cmake -D OPENCV_EXTRA_MODULES_PATH=<opencv_contrib>/modules -D BUILD_opencv_<r 


- **datasets**: Datasets Reader -- Code for reading existing computer vision databases and samples of using the readers to train, test and run using that dataset's data.



- **dnn_objdetect**: Object Detection using CNNs -- Implements compact CNN Model for object detection. Trained using Caffe but uses opencv_dnn modeule.

- **dnn_objdetect**: Object Detection using CNNs -- Implements compact CNN Model for object detection. Trained using Caffe but uses opencv_dnn module.



- **dnn_superres**: Superresolution using CNNs -- Contains four trained convolutional neural networks to upscale images.

modules/datasets/include/opencv2/datasets/dataset.hpp

+47 −0
Original line number Diff line number Diff line
@@ -435,6 +435,53 @@ Usage: 
./opencv/build/bin/example_datasets_slam_tumindoor -p=/home/user/path_to_unpacked_folders/

~~~



@defgroup datasets_sr Super Resolution



### The Berkeley Segmentation Dataset and Benchmark



Implements loading dataset:



"The Berkeley Segmentation Dataset and Benchmark": <https://www2.eecs.berkeley.edu/Research/Projects/CS/vision/grouping/segbench/>



Usage:

-# From link above download `BSDS300-images.tgz`.

-# Unpack.

-# To load data run:

~~~

./opencv/build/bin/example_datasets_sr_bsds -p=/home/user/path_to_unpacked_folder/

~~~



### DIV2K dataset: DIVerse 2K



Implements loading dataset:



"DIV2K dataset: DIVerse 2K": <https://data.vision.ee.ethz.ch/cvl/DIV2K/>



Usage:

-# From link above download 'Train data (HR images)' or any other of the dataset files.

-# Unpack.

-# To load data run:

~~~

./opencv/build/bin/example_datasets_sr_div2k -p=/home/user/path_to_unpacked_folder/folder_containing_the_images/

~~~



### The General-100 Dataset



Implements loading dataset:



"General-100 dataset contains 100 bmp-format images (with no compression).

We used this dataset in our FSRCNN ECCV 2016 paper. The size of these 100 images ranges from 710 x 704 (large) to 131 x 112 (small).

They are all of good quality with clear edges but fewer smooth regions (e.g., sky and ocean), thus are very suitable for the super-resolution training.":

<http://mmlab.ie.cuhk.edu.hk/projects/FSRCNN.html>



Usage:

-# From link above download `General-100.zip`.

-# Unpack.

-# To load data run:

~~~

./opencv/build/bin/example_datasets_sr_general100 -p=/home/user/path_to_unpacked_folder/

~~~



@defgroup datasets_tr Text Recognition



### The Chars74K Dataset

modules/datasets/include/opencv2/datasets/sr_bsds.hpp

0 → 100644
+41 −0
Original line number Diff line number Diff line 
// This file is part of OpenCV project.

// It is subject to the license terms in the LICENSE file found in the top-level directory

// of this distribution and at http://opencv.org/license.html.



#ifndef OPENCV_DATASETS_SR_BSDS_HPP

#define OPENCV_DATASETS_SR_BSDS_HPP



#include <string>

#include <vector>



#include "opencv2/datasets/dataset.hpp"



#include <opencv2/core.hpp>



namespace cv

{

namespace datasets

{



//! @addtogroup datasets_sr

//! @{



struct SR_bsdsObj : public Object

{

    std::string imageName;

};



class CV_EXPORTS SR_bsds : public Dataset

{

public:

    virtual void load(const std::string &path) CV_OVERRIDE = 0;



    static Ptr<SR_bsds> create();

};



//! @}



}

}



#endif
 
 No newline at end of file

modules/datasets/include/opencv2/datasets/sr_div2k.hpp

0 → 100644
+41 −0
Original line number Diff line number Diff line 
// This file is part of OpenCV project.

// It is subject to the license terms in the LICENSE file found in the top-level directory

// of this distribution and at http://opencv.org/license.html.



#ifndef OPENCV_DATASETS_SR_DIV2K_HPP

#define OPENCV_DATASETS_SR_DIV2K_HPP



#include <string>

#include <vector>



#include "opencv2/datasets/dataset.hpp"



#include <opencv2/core.hpp>



namespace cv

{

namespace datasets

{



//! @addtogroup datasets_sr

//! @{



struct SR_div2kObj : public Object

{

    std::string imageName;

};



class CV_EXPORTS SR_div2k : public Dataset

{

public:

    virtual void load(const std::string &path) CV_OVERRIDE = 0;



    static Ptr<SR_div2k> create();

};



//! @}



}

}



#endif
 
 No newline at end of file

modules/datasets/include/opencv2/datasets/sr_general100.hpp

0 → 100644
+41 −0
Original line number Diff line number Diff line 
// This file is part of OpenCV project.

// It is subject to the license terms in the LICENSE file found in the top-level directory

// of this distribution and at http://opencv.org/license.html.



#ifndef OPENCV_DATASETS_SR_GENERAL100_HPP

#define OPENCV_DATASETS_SR_GENERAL100_HPP



#include <string>

#include <vector>



#include "opencv2/datasets/dataset.hpp"



#include <opencv2/core.hpp>



namespace cv

{

namespace datasets

{



//! @addtogroup datasets_sr

//! @{



struct SR_general100Obj : public Object

{

    std::string imageName;

};



class CV_EXPORTS SR_general100 : public Dataset

{

public:

    virtual void load(const std::string &path) CV_OVERRIDE = 0;



    static Ptr<SR_general100> create();

};



//! @}



}

}



#endif
 
 No newline at end of file