Skip to content

Commit

Permalink
Merge pull request #174 from adamjw24/develop_v230_prep
Browse files Browse the repository at this point in the history 
Improved error handling, minor improvements
  • Loading branch information
@K-os
K-os authored Apr 29, 2024
2 parents 85ed28d + 8fb20c0 commit edd47ab
Show file tree
Hide file tree
Showing 103 changed files with 6,768 additions and 6,680 deletions.
41 changes: 41 additions & 0 deletions .gitlab-ci-internal.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,20 @@ build_gcc12_ubuntu2204:
CC: gcc-12
CXX: g++-12

build_gcc13_ubuntu2404:
extends: .build_only_template
image: $CI_REGISTRY/pub/dockerimages/ubuntu_2404_full:latest
variables:
CC: gcc-13
CXX: g++-13

build_gcc14_ubuntu2404:
extends: .build_only_template
image: $CI_REGISTRY/pub/dockerimages/ubuntu_2404_full:latest
variables:
CC: gcc-14
CXX: g++-14

build_clang7_ubuntu2004:
extends: .build_only_template_full
image: $CI_REGISTRY/pub/dockerimages/ubuntu_2004_full:latest
Expand Down Expand Up @@ -197,12 +211,39 @@ build_clang15_ubuntu2204:
CC: clang-15
CXX: clang++-15

build_clang16_ubuntu2404:
extends: .build_only_template_full
image: $CI_REGISTRY/pub/dockerimages/ubuntu_2404_full:latest
variables:
CC: clang-16
CXX: clang++-16

build_clang17_ubuntu2404:
extends: .build_only_template_full
image: $CI_REGISTRY/pub/dockerimages/ubuntu_2404_full:latest
variables:
CC: clang-17
CXX: clang++-17

build_clang18_ubuntu2404:
extends: .build_only_template_full
image: $CI_REGISTRY/pub/dockerimages/ubuntu_2404_full:latest
variables:
CC: clang-18
CXX: clang++-18

build_mingw_ubuntu2204:
extends: .build_only_template_full
image: $CI_REGISTRY/pub/dockerimages/ubuntu_2204_full:latest
variables:
toolchainfile: cmake/toolchains/x86_64-w64-mingw32-gcc-posix-ubuntu2204.cmake

build_aarch64_gcc_ubuntu2204:
extends: .build_only_template_full
image: $CI_REGISTRY/pub/dockerimages/ubuntu_2204_full:latest
variables:
toolchainfile: cmake/toolchains/aarch64-linux-gnu-gcc-ubuntu2204.cmake

build_ios:
extends: .build_only_template_full
variables:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cmake_minimum_required( VERSION 3.12.0 FATAL_ERROR )
cmake_policy( VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} )

# project name
project( vvdec VERSION 2.2.0 )
project( vvdec VERSION 2.3.0 )
# set alternative version numbering for release candidates
#set( PROJECT_VERSION_RC rc1 )
if( PROJECT_VERSION_RC )
Expand Down
8 changes: 4 additions & 4 deletions cmake/modules/define_bitstream_files.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ endif()
list( APPEND BITSTREAM_FILES
10b400_A_Bytedance_2.zip
10b400_B_Bytedance_2.zip
10b422_B_Sony_5.zip
10b444_A_Kwai_3.zip
10b444_B_Kwai_3.zip
8b400_A_Bytedance_2.zip
8b400_B_Bytedance_2.zip
8b420_A_Bytedance_2.zip
8b420_B_Bytedance_2.zip
8b422_B_Sony_5.zip
ACTPIC_A_Huawei_3.zip
ACTPIC_B_Huawei_3.zip
ACTPIC_C_Huawei_3.zip
Expand Down Expand Up @@ -256,6 +256,7 @@ list( APPEND BITSTREAM_FAULTY_FILES
# put bitstreams from the conformance set that are not supported (wrong profile/level etc)
list( APPEND BITSTREAM_NOT_MAIN10_FILES
10b422_A_Sony_5.zip # MAIN_10_444 and MAIN_10_444_STILL_PICTURE is still experimental.
10b422_B_Sony_5.zip # decodes correctly, when inferring sps_chroma_vertical_collocated_flag to be 0
10b422_C_Sony_5.zip # MAIN_10_444 and MAIN_10_444_STILL_PICTURE is still experimental.
10b422_D_Sony_5.zip # MAIN_10_444 and MAIN_10_444_STILL_PICTURE is still experimental.
10b422_E_Sony_5.zip # MAIN_10_444 and MAIN_10_444_STILL_PICTURE is still experimental.
Expand All @@ -266,9 +267,8 @@ list( APPEND BITSTREAM_NOT_MAIN10_FILES
10b422_J_Sony_5.zip # palette mode is not yet supported
10b422_K_Sony_5.zip # palette mode is not yet supported
10b422_L_Sony_5.zip # palette mode is not yet supported
10b444_A_Kwai_3.zip
10b444_B_Kwai_3.zip
8b422_A_Sony_5.zip # MAIN_10_444 and MAIN_10_444_STILL_PICTURE is still experimental.
8b422_B_Sony_5.zip # decodes correctly, when inferring sps_chroma_vertical_collocated_flag to be 0
8b422_C_Sony_5.zip # MAIN_10_444 and MAIN_10_444_STILL_PICTURE is still experimental.
8b422_D_Sony_5.zip # MAIN_10_444 and MAIN_10_444_STILL_PICTURE is still experimental.
8b422_E_Sony_5.zip # MAIN_10_444 and MAIN_10_444_STILL_PICTURE is still experimental.
Expand Down
8 changes: 4 additions & 4 deletions include/vvdec/vvdec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,17 +437,17 @@ typedef struct vvdecFrame
*/
typedef struct vvdecParams
{
int threads; // thread count ( default: -1 )
int parseThreads; // parser thread count ( default: -1 )
int threads; // thread count ( default: -1 )
int parseDelay; // number of frames to parse in parallel ( default: -1 )
vvdecRPRUpscaling upscaleOutput; // do internal upscaling of rpl pictures to dest. resolution ( default: 0 )
vvdecLogLevel logLevel; // verbosity level
bool verifyPictureHash; // verify picture, if digest is available, true: check hash in SEI messages if available, false: ignore SEI message
bool removePadding; // copy output pictures to new buffer to remove padding (stride==width) ( default: false )
vvdecSIMD_Extension simd; // set specific simd optimization (default: max. availalbe)
void *opaque; // opaque pointer for private user data ( can be used to carry application specific data or contexts )
vvdecErrHandlingFlags errHandlingFlags; // set of flags defining how to handle bitstream errors
int padding1; // reserved space for future parameters
int padding2;
int parseThreads; // DEPRECATED. Use `parseDelay` instead. This will be removed in the future. Until then, this value is copied to parseDelay if set.
int padding2; // reserved space for future parameters
int padding3;
int padding4;
} vvdecParams;
Expand Down
6 changes: 3 additions & 3 deletions source/App/vvdecapp/CmdLineParser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,10 @@ class CmdLineParser
{
if( i_arg == argc-1 ){ fprintf( stderr, " - missing argument for: %s \n", argv[i_arg] ); return -1; }
i_arg++;
int iThreads = atoi( argv[i_arg++] );
int iDelay = atoi( argv[i_arg++] );
if( rcParams.logLevel > VVDEC_VERBOSE )
fprintf( stdout, "[parsedelay] : %d\n", iThreads );
rcParams.parseThreads = iThreads;
fprintf( stdout, "[parsedelay] : %d\n", iDelay );
rcParams.parseDelay = iDelay;
}
else if( (!strcmp( (const char*)argv[i_arg], "-dph" )) || !strcmp( (const char*)argv[i_arg], "--SEIDecodedPictureHash" ) )
{
Expand Down
Loading

0 comments on commit edd47ab

Please sign in to comment.