Skip to content

Commit 68da885

Browse files
Documentation updated. Submodules updated.
1 parent 064d7e4 commit 68da885

File tree

8 files changed

+38
-37
lines changed

8 files changed

+38
-37
lines changed

3rdparty/ConfigReader

README.md

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
![vfilter_web_logo](_static/vfilter_web_logo.png)
1+
![vfilter_web_logo](./static/vfilter_web_logo.png)
22

33

44

55
# **VFilter C++ interface library**
66

7-
**v1.1.2**
7+
**v1.1.3**
88

99

1010

@@ -25,7 +25,7 @@
2525
- [setMask method](#setmask-method)
2626
- [encodeSetParamCommand method](#encodesetparamcommand-method)
2727
- [encodeCommand method](#encodecommand-method)
28-
- [decodeCommand method](#decodecommand-method)
28+
- [decodeCommand method](#decodecommand-method)
2929
- [decodeAndExecuteCommand method](#decodeandexecutecommand-method)
3030
- [Data structures](#data-structures)
3131
- [VFilterCommand enum](#vfiltercommand-enum)
@@ -42,7 +42,7 @@
4242

4343
# Overview
4444

45-
**VFilter** C++ library provides interface as well defines data structures for various video filters implementations. The **VFilter** interface represents video filter module which has video frames as input and output. The **VFilter.h** file contains declaration of data structures: [VFilterCommand](#vfiltercommand-enum) enum, [VFilterParam](#vfilterparam-enum) enum, [VFilterParams class declaration](#vfilterparams-class-declaration) class and [VFilter](#vfilter-interface-class-declaration) class declaration. The library depends on [Frame](https://github.com/ConstantRobotics-Ltd/Frame) library (describes data structures for video frames, Apache 2.0 license) and [ConfigReader](https://github.com/ConstantRobotics-Ltd/ConfigReader) library (provides methods to read/write JSON config files, Apache 2.0 license). The library uses C++17 standard and doesn't have third-party dependencies to be installed in OS. The library is licensed under the **Apache 2.0** license.
45+
**VFilter** C++ library provides interface as well defines data structures for various video filters implementations. The **VFilter** interface represents video filter module which has video frames as input and output. The **VFilter.h** file contains declaration of data structures: [VFilterCommand](#vfiltercommand-enum) enum, [VFilterParam](#vfilterparam-enum) enum, [VFilterParams](#vfilterparams-class-declaration) class and [VFilter](#vfilter-interface-class-declaration) class declaration. The library depends on [Frame](https://rapidpixel.constantrobotics.com/docs/service-libraries/frame.html) library (describes data structures for video frames, source code included, Apache 2.0 license) and [ConfigReader](https://rapidpixel.constantrobotics.com/docs/service-libraries/config-reader.html) library (provides methods to read/write JSON config files, source code included, Apache 2.0 license). The library uses C++17 standard and doesn't have third-party dependencies to be installed in OS. The library is licensed under the **Apache 2.0** license.
4646

4747

4848

@@ -56,6 +56,7 @@
5656
| 1.1.0 | 22.02.2024 | - Added setMask(...) method.<br />- Added initVFilter(...) to initialize video filter.<br />- Documentation updated. |
5757
| 1.1.1 | 25.02.2024 | - Parameter processingTimeMcSec excluded from JSON to read / write. |
5858
| 1.1.2 | 24.03.2024 | - Frame class updated.<br />- ConfigReader class updated.<br />- Documentation updated. |
59+
| 1.1.3 | 21.05.2024 | - Submodules updated.<br />- Documentation updated. |
5960

6061

6162

@@ -64,26 +65,26 @@
6465
The library supplied by source code only. The user would be given a set of files in the form of a CMake project (repository). The repository structure is shown below:
6566

6667
```xml
67-
CMakeLists.txt ------------------ Main CMake file of the library.
68-
3rdparty ------------------------ Folder with third-party libraries.
69-
CMakeLists.txt -------------- CMake file which includes third-party libraries.
70-
ConfigReader ---------------- Source code of the ConfigReader library.
71-
Frame ----------------------- Source code of the Frame library.
72-
src ----------------------------- Folder with source code of the library.
73-
CMakeLists.txt -------------- CMake file of the library.
74-
VFilter.cpp ----------------- Source code file of the library.
75-
VFilter.h ------------------- Header file which includes VFilter class declaration.
76-
VFilterVersion.h ------------ Header file which includes version of the library.
77-
VFilterVersion.h.in --------- CMake service file to generate version file.
78-
test ---------------------------- Folder for internal tests of library.
79-
CMakeLists.txt -------------- CMake file for tests application.
80-
main.cpp -------------------- Source code file tests application.
81-
example ------------------------- Folder with source code of the custom VFilter implementation.
82-
CMakeLists.txt -------------- CMake file of the library.
83-
CustomVFilter.cpp ----------- Source code file of the library.
84-
CustomVFilter.h ------------- Header file which includes CustomVFilter class declaration.
85-
CustomVFilterVersion.h ------ Header file which includes version of the library.
86-
CustomVFilterVersion.h.in --- CMake service file to generate version file.
68+
CMakeLists.txt ----------------- Main CMake file of the library.
69+
3rdparty ----------------------- Folder with third-party libraries.
70+
CMakeLists.txt ------------- CMake file to includes third-party libraries.
71+
ConfigReader --------------- Folder with ConfigReader library source code.
72+
Frame ---------------------- Folder with Frame library source code.
73+
src ---------------------------- Folder with source code of the library.
74+
CMakeLists.txt ------------- CMake file of the library.
75+
VFilter.cpp ---------------- C++ implementation file.
76+
VFilter.h ------------------ Main header file of the library.
77+
VFilterVersion.h ----------- Header file which includes version of the library.
78+
VFilterVersion.h.in -------- Service CMake file to generate version file.
79+
test --------------------------- Folder for the test application.
80+
CMakeLists.txt ------------- CMake file for the test application.
81+
main.cpp ------------------- Source code file of the test application.
82+
example ------------------------ Folder with source code of the custom VFilter implementation.
83+
CMakeLists.txt ------------- CMake file of the library.
84+
CustomVFilter.cpp ---------- Source code file of the library.
85+
CustomVFilter.h ------------ Header file which includes CustomVFilter class declaration.
86+
CustomVFilterVersion.h ----- Header file which includes version of the library.
87+
CustomVFilterVersion.h.in -- CMake service file to generate version file.
8788
```
8889

8990

@@ -104,7 +105,7 @@ public:
104105
/// Class destructor.
105106
virtual ~VFilter();
106107

107-
/// version of the VFilter class.
108+
/// Get the version of the VFilter class.
108109
static std::string getVersion();
109110

110111
/// Initialize video filter.
@@ -163,7 +164,7 @@ std::cout << "VFilter version: " << cr::video::VFilter::getVersion();
163164
Console output:
164165

165166
```bash
166-
VFilter class version: 1.1.2
167+
VFilter class version: 1.1.3
167168
```
168169

169170

@@ -257,7 +258,7 @@ virtual bool processFrame(cr::video::Frame& frame) = 0;
257258

258259
| Parameter | Description |
259260
| --------- | ------------------------------------------------------------ |
260-
| frame | Reference to [Frame](https://github.com/ConstantRobotics-Ltd/Frame) object. Particular video filter implementation must keep original video frame resolution (width and height), **sourceId** and **frameId** fields. |
261+
| frame | Reference to [Frame](https://rapidpixel.constantrobotics.com/docs/service-libraries/frame.html) object. Particular video filter implementation must keep original video frame resolution (width and height), **sourceId** and **frameId** fields. |
261262

262263
**Returns:** TRUE if frame processed or FALSE if not. If filter disabled the method should return TRUE without video frame processing.
263264

@@ -273,7 +274,7 @@ virtual bool setMask(cr::video::Frame mask) = 0;
273274
274275
| Parameter | Description |
275276
| --------- | ------------------------------------------------------------ |
276-
| mask | Filter mask is [Frame](https://github.com/ConstantRobotics-Ltd/Frame) object with GRAY pixel format. Filter omits image segments, where filter mask pixel values equal 0. |
277+
| mask | Filter mask is [Frame](https://rapidpixel.constantrobotics.com/docs/service-libraries/frame.html) object with GRAY pixel format. Filter omits image segments, where filter mask pixel values equal 0. |
277278
278279
**Returns:** TRUE if the filter mask was set or FALSE if not.
279280
@@ -610,7 +611,7 @@ params2.decode(buffer, size);
610611

611612
## Read params from JSON file and write to JSON file
612613

613-
**VFilter** depends on open source [ConfigReader](https://github.com/ConstantRobotics-Ltd/ConfigReader) library which provides method to read params from JSON file and to write params to JSON file. Example of writing and reading params to JSON file:
614+
**VFilter** depends on open source [ConfigReader](https://rapidpixel.constantrobotics.com/docs/service-libraries/config-reader.html) library which provides method to read params from JSON file and to write params to JSON file. Example of writing and reading params to JSON file:
614615

615616
```cpp
616617
// Write params to file.
@@ -638,9 +639,9 @@ if(!outConfig.readFromFile("VFilterParams.json"))
638639
"mode": 2,
639640
"processingTimeMcSec": 23,
640641
"type": 1,
641-
"custom1": 0.7f,
642-
"custom2": 12.0f,
643-
"custom3": 0.61f
642+
"custom1": 0.7,
643+
"custom2": 12.0,
644+
"custom3": 0.61
644645
}
645646
}
646647
```
-171 KB
Binary file not shown.
171 KB
Binary file not shown.

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.13)
66
## INTERFACE-PROJECT
77
## name and version
88
###############################################################################
9-
project(VFilter VERSION 1.1.2 LANGUAGES CXX)
9+
project(VFilter VERSION 1.1.3 LANGUAGES CXX)
1010

1111

1212

src/VFilterVersion.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
#define VFILTER_MAJOR_VERSION 1
44
#define VFILTER_MINOR_VERSION 1
5-
#define VFILTER_PATCH_VERSION 2
5+
#define VFILTER_PATCH_VERSION 3
66

7-
#define VFILTER_VERSION "1.1.2"
7+
#define VFILTER_VERSION "1.1.3"
File renamed without changes.

0 commit comments

Comments
 (0)