Skip to content

Commit c5a6597

Browse files
author
Louis Fréneau
committed
- Update to last Kvazaar version (no BD-BR impact)
- Update CI md5 accordingly - Default generator is Unix Makefiles - Add tests for Release mode - Update the Readme
1 parent 1fb0415 commit c5a6597

File tree

4 files changed

+25
-19
lines changed

4 files changed

+25
-19
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set(uvgVPCCenc_DESCR "uvgVPCCenc is an open-source real-time V-PCC encoder libra
88
set(uvgVPCCenc_URL "https://github.com/ultravideo/uvgVPCCenc")
99

1010
set(KVAZAAR_REPO_URL "https://github.com/ultravideo/kvazaar.git")
11-
set(KVAZAAR_REPO_TAGS "bb836ff1422f247b490230e9d429a2d6658cd1a1")
11+
set(KVAZAAR_REPO_TAGS "32fb3462eb97fdf07aeb41fbf0b311678419d659")
1212

1313
set(KVAZAAR_EP_UPDATE_DISCONNECTED ON)
1414
set(PCCSUM_EP_UPDATE_DISCONNECTED ON)

CMakePresets.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{
1010
"name":"base-config",
1111
"hidden":true,
12-
"generator":"Ninja",
12+
"generator":"Unix Makefiles",
1313
"binaryDir":"${sourceDir}/_build/${presetName}",
1414
"cacheVariables":{
1515
"BUILD_SHARED_LIBS":true,
@@ -27,6 +27,7 @@
2727
"cacheVariables": {
2828
"CMAKE_BUILD_TYPE": "Release",
2929
"ENABLE_TESTING": true,
30+
"ENABLE_CI_TESTING":true,
3031
"CMAKE_CXX_FLAGS_RELEASE": "-O3 -DNDEBUG"
3132
}
3233
},
@@ -117,6 +118,11 @@
117118
"inherits":"base-test",
118119
"configurePreset":"Debug"
119120
},
121+
{
122+
"name":"Release",
123+
"inherits":"base-test",
124+
"configurePreset":"Release"
125+
},
120126
{
121127
"name":"RelWithDebInfo",
122128
"inherits":"base-test",

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ https://ultravideo.fi/uvgvpccenc.html for more information.
2929

3030
## Compilation and testing
3131
### Dependencies
32-
To compile the library and the application, please install ```CMake```, ```Ninja``` and ```g++```.
32+
To compile the library and the application, please install ```CMake``` and ```g++```.
3333
On Debian/Ubuntu:
3434
```
35-
sudo apt install cmake ninja-build g++
35+
sudo apt install cmake g++
3636
```
3737

3838
To generate the documentation, ```doxygen``` and ```graphviz``` are required.
@@ -54,9 +54,7 @@ Refer to "Using uvgVPCCenc" section to learn how to use the library, and attache
5454
### Test uvgVPCCenc
5555
To test the encoder, please use following commands:
5656
```
57-
cmake --preset=CI
58-
cmake --build --preset=CI
59-
ctest --preset=CI
57+
ctest --preset=Release
6058
```
6159

6260
This runs small tests and checks whether the resulting encoding behaves as expected by verifying the bitstream MD5.

tests/ref_md5.csv

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
test_name,md5_bitstream,md5_pc;
2-
ReadyForWinter_vox9_fast_RA_16-22-2,e2733465733127770bffc9dfc5a50a02,;
3-
ReadyForWinter_vox9_slow_RA_32-42-4,294ea4a9af88a688a256fe6ec2986da0,;
4-
ReadyForWinter_vox9_fast_AI_32-42-4,0a509b057003bbbf8237e7c991b59627,;
5-
ReadyForWinter_vox9_slow_AI_16-22-2,7b86fa43a005889ab801faf2c585ee98,;
6-
FlowerWave_vox10_fast_RA_32-42-4,869239ace9530e9fcf1027db3a83a79f,;
7-
Gymnast_vox10_slow_RA_16-22-2,c3f0ecd6faa22a172fa791d4e11357eb,;
8-
Gymnast_vox10_fast_AI_32-42-4,bfb4952094daaa2d824dce08dd020d8f,;
9-
FlowerWave_vox10_fast_AI_16-22-2,d58ee550c201fd72e114fb576fb56f08,;
10-
CasualSquat_vox11_fast_RA_16-22-2,cead9feeccca59da9d1c3ff47933197e,;
11-
BlueBackpack_vox11_slow_RA_16-22-2,bc8a39a74df2079253b1e0531486d9b7,;
12-
BlueBackpack_vox11_slow_AI_32-42-4,7a5c727fd008f76ed71c96e2485c16a9,;
13-
CasualSquat_vox11_slow_AI_32-42-4,d5aa84d58efbc8273af2f9198b7b8fd0,;
2+
ReadyForWinter_vox9_fast_RA_16-22-2,a58ad0f31a8b1110631a5561161511ab,;
3+
ReadyForWinter_vox9_slow_RA_32-42-4,dbd339bbe9675e158b092a28ef12bc3d,;
4+
ReadyForWinter_vox9_fast_AI_32-42-4,fef6acb320d4ded86bc5d5f0ad318542,;
5+
ReadyForWinter_vox9_slow_AI_16-22-2,d88e8888d85e9394d4590e973e74a59f,;
6+
FlowerWave_vox10_fast_RA_32-42-4,3994d183a2764617ba083be08333c4a6,;
7+
Gymnast_vox10_slow_RA_16-22-2,7fb74185fae84aaca68fda795b4c740c,;
8+
Gymnast_vox10_fast_AI_32-42-4,9c6326ef2a33043ef7523c9b295202c9,;
9+
FlowerWave_vox10_fast_AI_16-22-2,2479db6b0319dc9f6938de427049bc57,;
10+
CasualSquat_vox11_fast_RA_16-22-2,bbff38ec05d4bb7ca3862d4793685a82,;
11+
BlueBackpack_vox11_slow_RA_16-22-2,08e0ccdc1a35a07e1bba3a3a807aafd3,;
12+
BlueBackpack_vox11_slow_AI_32-42-4,eabad729f20358fbe575044add75de91,;
13+
CasualSquat_vox11_slow_AI_32-42-4,fc852beb833cdbd8bd276fa739cc63cd,;
14+
15+

0 commit comments

Comments
 (0)