Compare commits
7
Commits
521e56202c
...
c854e76fd8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c854e76fd8 | ||
|
|
8f290d6351 | ||
|
|
fc038eb62f | ||
|
|
fedcb2e03a | ||
|
|
e755608b02 | ||
|
|
2debe78ed8 | ||
|
|
4d1730f928 |
No files matched your search
+8
-6
@@ -27,13 +27,15 @@ with section("format"):
|
||||
# How many spaces to tab for indent
|
||||
tab_size = 2
|
||||
|
||||
max_pargs_hwrap = 8
|
||||
# If an argument group contains more than this many sub-groups (parg or kwarg
|
||||
# groups) then force it to a vertical layout.
|
||||
max_subgroups_hwrap = 2
|
||||
|
||||
## If true, lines are indented using tab characters (utf-8 0x09) instead of
|
||||
## <tab_size> space characters (utf-8 0x20). In cases where the layout would
|
||||
## require a fractional tab character, the behavior of the fractional
|
||||
## indentation is governed by <fractional_tab_policy>
|
||||
#use_tabchars = False
|
||||
# If a positional argument group contains more than this many arguments, then
|
||||
# force it to a vertical layout.
|
||||
max_pargs_hwrap = 6
|
||||
|
||||
dangle_parens = True
|
||||
|
||||
# Format command names consistently as 'lower' or 'upper' case
|
||||
command_case = 'upper'
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
name: Build and Test
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- devel
|
||||
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Install Dependencies
|
||||
run: sudo apt-get install cmake qtbase5-dev libavcodec-dev libavformat-dev libavutil-dev libopencv-dev libopencv-video-dev libopencv-contrib-dev
|
||||
|
||||
- name: Build CMake
|
||||
uses: ashutoshvarma/action-cmake-build@v1
|
||||
with:
|
||||
build-dir: ${{ runner.workspace }}/build
|
||||
# will set the CC & CXX for cmake
|
||||
cc: gcc
|
||||
cxx: g++
|
||||
build-type: Release
|
||||
# Extra options pass to cmake while configuring project
|
||||
configure-options: -DBUILD_TESTS=ON -DUSE_WERROR=ON
|
||||
run-test: true
|
||||
#ctest-options: -R mytest
|
||||
# install the build using cmake --install
|
||||
install-build: true
|
||||
# run build using '-j [parallel]' to use multiple threads to build
|
||||
parallel: 14
|
||||
+4
-5
@@ -136,11 +136,10 @@ fabric.properties
|
||||
|
||||
### vscode ###
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
*.code-workspace
|
||||
|
||||
# Documentation
|
||||
doc/
|
||||
doc/
|
||||
|
||||
# CLang
|
||||
compile_commands.json
|
||||
@@ -21,7 +21,7 @@ repos:
|
||||
- id: cmake-lint
|
||||
|
||||
- repo: https://github.com/pocc/pre-commit-hooks
|
||||
rev: python
|
||||
rev: v1.1.1
|
||||
hooks:
|
||||
- id: clang-format
|
||||
args: [--style=file, -i]
|
||||
+22
-11
@@ -18,10 +18,12 @@ INCLUDE(GNUInstallDirs)
|
||||
|
||||
SET(PROJECT_NAME
|
||||
"calyp"
|
||||
CACHE INTERNAL "" FORCE)
|
||||
CACHE INTERNAL "" FORCE
|
||||
)
|
||||
SET(PROJECT_LIBRARY
|
||||
"Calyp"
|
||||
CACHE INTERNAL "" FORCE)
|
||||
CACHE INTERNAL "" FORCE
|
||||
)
|
||||
|
||||
PROJECT(${PROJECT_NAME})
|
||||
SET(CALYP_VERSION_MAJOR "1")
|
||||
@@ -29,7 +31,8 @@ SET(CALYP_VERSION_MINOR "1")
|
||||
SET(CALYP_VERSION_PATCH "0")
|
||||
SET(CALYP_VERSION
|
||||
"${CALYP_VERSION_MAJOR}.${CALYP_VERSION_MINOR}.${CALYP_VERSION_PATCH}"
|
||||
CACHE INTERNAL "" FORCE)
|
||||
CACHE INTERNAL "" FORCE
|
||||
)
|
||||
|
||||
# ####################################################################################################################################################
|
||||
# Variables
|
||||
@@ -65,13 +68,15 @@ IF(NOT RELEASE_BUILD AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
|
||||
${GIT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
ARGS "describe --tags"
|
||||
OUTPUT_VARIABLE CALYP_GIT_REVISION
|
||||
RETURN_VALUE TAG_RESULT)
|
||||
RETURN_VALUE TAG_RESULT
|
||||
)
|
||||
# git describe --tags failed; maybe the repository was checked with depth=1.
|
||||
IF(NOT ${TAG_RESULT} EQUAL 0)
|
||||
EXEC_PROGRAM(
|
||||
${GIT_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
ARGS "describe --always"
|
||||
OUTPUT_VARIABLE CALYP_GIT_REVISION)
|
||||
OUTPUT_VARIABLE CALYP_GIT_REVISION
|
||||
)
|
||||
ENDIF()
|
||||
MESSAGE(STATUS "Calyp Git revision: ${CALYP_GIT_REVISION}")
|
||||
SET(CALYP_VERSION_STRING "${CALYP_VERSION} (rev. ${CALYP_GIT_REVISION})")
|
||||
@@ -82,7 +87,8 @@ ENDIF()
|
||||
|
||||
SET(UPDATE_CHANNEL
|
||||
"stable"
|
||||
CACHE STRING "Update channel")
|
||||
CACHE STRING "Update channel"
|
||||
)
|
||||
# CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/CalypUpdate.xml.in ${CMAKE_CURRENT_BINARY_DIR}/CalypUpdate-${UPDATE_CHANNEL}.xml )
|
||||
|
||||
# ####################################################################################################################################################
|
||||
@@ -97,7 +103,8 @@ SET_PACKAGE_PROPERTIES(
|
||||
Doxygen PROPERTIES
|
||||
URL "http://www.doxygen.org/"
|
||||
DESCRIPTION "Doxygen"
|
||||
TYPE OPTIONAL)
|
||||
TYPE OPTIONAL
|
||||
)
|
||||
|
||||
IF(BUILD_TESTS)
|
||||
FIND_PACKAGE(GTest)
|
||||
@@ -108,7 +115,8 @@ IF(BUILD_TESTS)
|
||||
ENDIF()
|
||||
SET(CALYP_TEST_DATA_DIR
|
||||
"CALYP_TEST_DATA_DIR"
|
||||
CACHE PATH "Location of video information for testing")
|
||||
CACHE PATH "Location of video information for testing"
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
OPTION(USE_OPENCV "Add OpenCV support" ON)
|
||||
@@ -133,7 +141,8 @@ SET_PACKAGE_PROPERTIES(
|
||||
OpenCV PROPERTIES
|
||||
URL "http://opencv.willowgarage.com"
|
||||
DESCRIPTION "OpenCV library support in CalypFrame"
|
||||
TYPE OPTIONAL)
|
||||
TYPE OPTIONAL
|
||||
)
|
||||
|
||||
OPTION(USE_FFMPEG "Add FFMPEG support" ON)
|
||||
IF(USE_FFMPEG)
|
||||
@@ -148,7 +157,8 @@ SET_PACKAGE_PROPERTIES(
|
||||
FFmpeg PROPERTIES
|
||||
URL "http://ffmpeg.org/"
|
||||
DESCRIPTION "Libav library support in CalypStream"
|
||||
TYPE OPTIONAL)
|
||||
TYPE OPTIONAL
|
||||
)
|
||||
|
||||
IF(WIN32)
|
||||
SET(USE_STATIC ON)
|
||||
@@ -165,7 +175,8 @@ INCLUDE(FeatureSummary)
|
||||
# must go before the project command
|
||||
SET(CMAKE_CONFIGURATION_TYPES
|
||||
"Debug;Release"
|
||||
CACHE STRING "Configs" FORCE)
|
||||
CACHE STRING "Configs" FORCE
|
||||
)
|
||||
IF(DEFINED CMAKE_BUILD_TYPE AND CMAKE_VERSION VERSION_GREATER "2.8")
|
||||
SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES})
|
||||
ENDIF()
|
||||
|
||||
+16
-8
@@ -2,8 +2,10 @@
|
||||
# CMakeLists for calyp app component
|
||||
#
|
||||
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/external ${CMAKE_CURRENT_SOURCE_DIR}/dialog
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/docks ${CMAKE_CURRENT_SOURCE_DIR}/widgets)
|
||||
INCLUDE_DIRECTORIES(
|
||||
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/external ${CMAKE_CURRENT_SOURCE_DIR}/dialog ${CMAKE_CURRENT_SOURCE_DIR}/docks
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/widgets
|
||||
)
|
||||
|
||||
OPTION(USE_QTDBUS "Build with QtDBus" ON)
|
||||
OPTION(USE_FERVOR "Add Fervor support" OFF)
|
||||
@@ -19,12 +21,14 @@ IF(USE_QTDBUS)
|
||||
SET_PACKAGE_PROPERTIES(
|
||||
Qt5DBus PROPERTIES
|
||||
DESCRIPTION "Support for Qt5 DBus messages between instances"
|
||||
TYPE OPTIONAL)
|
||||
TYPE OPTIONAL
|
||||
)
|
||||
IF(${Qt5DBus_FOUND})
|
||||
SET(USE_QTDBUS ${Qt5DBus_FOUND}) # TODO: fix this stupid variable
|
||||
SET(USE_QTDBUS
|
||||
${Qt5DBus_FOUND}
|
||||
PARENT_SCOPE)
|
||||
PARENT_SCOPE
|
||||
)
|
||||
LIST(APPEND QT_LINKER_LIBS Qt5::DBus)
|
||||
LIST(APPEND QT_MODULES DBus)
|
||||
ENDIF()
|
||||
@@ -63,7 +67,8 @@ SET(Calyp_App_SRCS
|
||||
# Docks
|
||||
docks/FramePropertiesDock.cpp
|
||||
docks/ModuleHandleDock.cpp
|
||||
docks/QualityMeasurementSidebar.cpp)
|
||||
docks/QualityMeasurementSidebar.cpp
|
||||
)
|
||||
|
||||
IF(USE_QTDBUS)
|
||||
LIST(APPEND Calyp_App_SRCS DBusAppAdaptor.cpp)
|
||||
@@ -109,7 +114,8 @@ SET_PACKAGE_PROPERTIES(
|
||||
Fervor PROPERTIES
|
||||
URL "https://github.com/pypt/fervor"
|
||||
DESCRIPTION "Fervor lib includes check for updates feature"
|
||||
TYPE OPTIONAL)
|
||||
TYPE OPTIONAL
|
||||
)
|
||||
ADD_FEATURE_INFO(Fervor USE_FERVOR "Fervor lib includes check for updates feature.")
|
||||
|
||||
QT5_WRAP_UI(Calyp_App_UI_Wrap ${Calyp_App_UI})
|
||||
@@ -126,13 +132,15 @@ IF(WIN32)
|
||||
OUTPUT ${WINDOWS_RES_FILE}
|
||||
COMMAND rc.exe /fo ${WINDOWS_RES_FILE} ${PROJECT_NAME}.rc
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources
|
||||
COMMENT "Add icon on windows platform")
|
||||
COMMENT "Add icon on windows platform"
|
||||
)
|
||||
ELSE()
|
||||
ADD_CUSTOM_COMMAND(
|
||||
OUTPUT ${WINDOWS_RES_FILE}
|
||||
COMMAND windres.exe ${PROJECT_NAME}.rc ${WINDOWS_RES_FILE}
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources
|
||||
COMMENT "Add icon on windows platform")
|
||||
COMMENT "Add icon on windows platform"
|
||||
)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
|
||||
+14
-7
@@ -53,19 +53,23 @@ MACRO(find_component _component _pkgconfig _library _header)
|
||||
FIND_PATH(
|
||||
${_component}_INCLUDE_DIRS ${_header}
|
||||
HINTS ${PC_LIB${_component}_INCLUDEDIR} ${PC_LIB${_component}_INCLUDE_DIRS}
|
||||
PATH_SUFFIXES ffmpeg)
|
||||
PATH_SUFFIXES ffmpeg
|
||||
)
|
||||
|
||||
FIND_LIBRARY(
|
||||
${_component}_LIBRARIES
|
||||
NAMES ${_library}
|
||||
HINTS ${PC_LIB${_component}_LIBDIR} ${PC_LIB${_component}_LIBRARY_DIRS})
|
||||
HINTS ${PC_LIB${_component}_LIBDIR} ${PC_LIB${_component}_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
SET(${_component}_DEFINITIONS
|
||||
${PC_${_component}_CFLAGS_OTHER}
|
||||
CACHE STRING "The ${_component} CFLAGS.")
|
||||
CACHE STRING "The ${_component} CFLAGS."
|
||||
)
|
||||
SET(${_component}_VERSION
|
||||
${PC_${_component}_VERSION}
|
||||
CACHE STRING "The ${_component} version number.")
|
||||
CACHE STRING "The ${_component} version number."
|
||||
)
|
||||
|
||||
SET_COMPONENT_FOUND(${_component})
|
||||
|
||||
@@ -104,13 +108,16 @@ IF(NOT FFMPEG_LIBRARIES)
|
||||
# cache the vars.
|
||||
SET(FFMPEG_INCLUDE_DIRS
|
||||
${FFMPEG_INCLUDE_DIRS}
|
||||
CACHE STRING "The FFmpeg include directories." FORCE)
|
||||
CACHE STRING "The FFmpeg include directories." FORCE
|
||||
)
|
||||
SET(FFMPEG_LIBRARIES
|
||||
${FFMPEG_LIBRARIES}
|
||||
CACHE STRING "The FFmpeg libraries." FORCE)
|
||||
CACHE STRING "The FFmpeg libraries." FORCE
|
||||
)
|
||||
SET(FFMPEG_DEFINITIONS
|
||||
${FFMPEG_DEFINITIONS}
|
||||
CACHE STRING "The FFmpeg cflags." FORCE)
|
||||
CACHE STRING "The FFmpeg cflags." FORCE
|
||||
)
|
||||
|
||||
MARK_AS_ADVANCED(FFMPEG_INCLUDE_DIRS FFMPEG_LIBRARIES FFMPEG_DEFINITIONS)
|
||||
|
||||
|
||||
@@ -9,13 +9,16 @@ MACRO(ADD_MODULE name file)
|
||||
LIST(APPEND MODULES_LIST_FILES ${file})
|
||||
SET(Calyp_Mod_SRCS
|
||||
"${Calyp_Mod_SRCS}"
|
||||
PARENT_SCOPE)
|
||||
PARENT_SCOPE
|
||||
)
|
||||
SET(MODULES_LIST_NAME
|
||||
"${MODULES_LIST_NAME}"
|
||||
PARENT_SCOPE)
|
||||
PARENT_SCOPE
|
||||
)
|
||||
SET(MODULES_LIST_FILES
|
||||
"${MODULES_LIST_FILES}"
|
||||
PARENT_SCOPE)
|
||||
PARENT_SCOPE
|
||||
)
|
||||
ENDIF()
|
||||
UNSET(__modulename)
|
||||
ENDMACRO()
|
||||
@@ -50,7 +53,8 @@ ENDMACRO()
|
||||
# Create header
|
||||
MACRO(CREATE_MODULE_MACROS)
|
||||
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h "// This files add the header files of each module\n"
|
||||
"#ifndef __MODULESLISTHEADER_H__\n#define __MODULESLISTHEADER_H__\n")
|
||||
"#ifndef __MODULESLISTHEADER_H__\n#define __MODULESLISTHEADER_H__\n"
|
||||
)
|
||||
FOREACH(module ${MODULES_LIST_FILES})
|
||||
FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h "#include \"${module}.h\"\n")
|
||||
ENDFOREACH(module ${MODULES_LIST_FILES})
|
||||
|
||||
+16
-8
@@ -11,23 +11,28 @@ ENDFOREACH(OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES)
|
||||
|
||||
SET(MSVC_DLL_DIR
|
||||
"MSVC_DLL_DIR"
|
||||
CACHE PATH "Where to find MSVC dlls")
|
||||
CACHE PATH "Where to find MSVC dlls"
|
||||
)
|
||||
# INSTALL(FILES ${MSVC_DLL_DIR}/msvcr120.dll DESTINATION bin ) INSTALL(FILES ${MSVC_DLL_DIR}/msvcp120.dll DESTINATION bin )
|
||||
|
||||
SET(QT_DIR
|
||||
"QT-Dir"
|
||||
CACHE PATH "Where to find QT Lib on Windows")
|
||||
CACHE PATH "Where to find QT Lib on Windows"
|
||||
)
|
||||
SET(QT_ICU_VERSION
|
||||
""
|
||||
CACHE STRING "Qt ICU version of dll's")
|
||||
CACHE STRING "Qt ICU version of dll's"
|
||||
)
|
||||
SET(QT_DLL_POSTFIX
|
||||
""
|
||||
CACHE STRING "Postfix to dll's name for debug")
|
||||
CACHE STRING "Postfix to dll's name for debug"
|
||||
)
|
||||
SET(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH} ${QT_DIR}")
|
||||
|
||||
SET(WINDLLIB
|
||||
"Dl-location"
|
||||
CACHE PATH "Where to find DL Lib on Windows")
|
||||
CACHE PATH "Where to find DL Lib on Windows"
|
||||
)
|
||||
|
||||
IF(NOT USE_QT4)
|
||||
INSTALL(FILES ${QT_DIR}/bin/Qt5Core${QT_DLL_POSTFIX}.dll DESTINATION bin)
|
||||
@@ -56,10 +61,12 @@ ENDIF()
|
||||
IF(USE_OPENCV)
|
||||
SET(OpenCV_DLL_DIR
|
||||
"${OpenCV_DIR}/bin"
|
||||
CACHE PATH "Where to find OpenCV dlls")
|
||||
CACHE PATH "Where to find OpenCV dlls"
|
||||
)
|
||||
SET(OpenCV_INSTALL_MODULES
|
||||
${OPENCV_MODULES}
|
||||
CACHE STRING "List of OpenCV modules")
|
||||
CACHE STRING "List of OpenCV modules"
|
||||
)
|
||||
FOREACH(opencv_module IN LISTS OpenCV_INSTALL_MODULES)
|
||||
INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_${opencv_module}${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin)
|
||||
ENDFOREACH()
|
||||
@@ -68,7 +75,8 @@ ENDIF()
|
||||
IF(USE_FFMPEG)
|
||||
SET(FFMPEG_DIR
|
||||
"FFmpeg-Dir"
|
||||
CACHE PATH "Where to find FFmpeg Lib on Windows")
|
||||
CACHE PATH "Where to find FFmpeg Lib on Windows"
|
||||
)
|
||||
INSTALL(FILES ${FFMPEG_DIR}/bin/avcodec-${AVCODEC_VERSION}.dll DESTINATION bin)
|
||||
INSTALL(FILES ${FFMPEG_DIR}/bin/avformat-${AVFORMAT_VERSION}.dll DESTINATION bin)
|
||||
INSTALL(FILES ${FFMPEG_DIR}/bin/avutil-${AVUTIL_VERSION}.dll DESTINATION bin)
|
||||
|
||||
+20
-18
@@ -6,17 +6,9 @@ INCLUDE(GNUInstallDirs)
|
||||
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
SET(Calyp_Lib_SRCS
|
||||
LibMemory.h
|
||||
CalypLib.h
|
||||
CalypDefs.h
|
||||
# Frame
|
||||
CalypFrame.h
|
||||
CalypFrame.cpp
|
||||
CalypPixel.cpp
|
||||
PixelFormats.h
|
||||
PixelFormats.cpp
|
||||
# Stream
|
||||
SET(Calyp_Lib_Frame_SRCS CalypPixel.cpp PixelFormats.h PixelFormats.cpp CalypFrame.h CalypFrame.cpp)
|
||||
|
||||
SET(Calyp_Lib_Stream_SRCS
|
||||
CalypStream.h
|
||||
CalypStream.cpp
|
||||
CalypStreamHandlerIf.h
|
||||
@@ -24,12 +16,21 @@ SET(Calyp_Lib_SRCS
|
||||
StreamHandlerRaw.cpp
|
||||
StreamHandlerPortableMap.h
|
||||
StreamHandlerPortableMap.cpp
|
||||
# Options Parser
|
||||
CalypOptions.h
|
||||
CalypOptions.cpp
|
||||
# Modules
|
||||
CalypModuleIf.h
|
||||
CalypOpenCVModuleIf.h)
|
||||
)
|
||||
|
||||
SET(Calyp_Lib_OptionParser_SRCS CalypOptions.h CalypOptions.cpp)
|
||||
|
||||
SET(Calyp_Lib_Modules_SRCS CalypOptions.h CalypOptions.cpp)
|
||||
|
||||
SET(Calyp_Lib_SRCS
|
||||
LibMemory.h
|
||||
CalypLib.h
|
||||
CalypDefs.h
|
||||
${Calyp_Lib_Frame_SRCS}
|
||||
${Calyp_Lib_Stream_SRCS}
|
||||
${Calyp_Lib_OptionParser_SRCS}
|
||||
${Calyp_Lib_Modules_SRCS}
|
||||
)
|
||||
|
||||
LIST(APPEND CMAKE_CFG_LINKER_LIBSS ${PROJECT_LIBRARY})
|
||||
LIST(APPEND CMAKE_CFG_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
|
||||
@@ -75,7 +76,8 @@ IF(NOT USE_STATIC)
|
||||
TARGETS ${PROJECT_LIBRARY}
|
||||
RUNTIME DESTINATION bin
|
||||
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
|
||||
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
)
|
||||
INSTALL(FILES ${Calyp_Lib_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
|
||||
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/CalypConfig.cmake DESTINATION share/calyp)
|
||||
ENDIF()
|
||||
|
||||
+30
-5
@@ -5,7 +5,8 @@
|
||||
OPTION(CALYP_THREADED_MODULES "Use threads for modules" OFF)
|
||||
SET(CALYP_EXTRA_MODULES_DIR
|
||||
"CALYP_EXTRA_MODULES_DIR"
|
||||
CACHE PATH "Location of extra Calyp modules")
|
||||
CACHE PATH "Location of extra Calyp modules"
|
||||
)
|
||||
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
@@ -35,13 +36,37 @@ ADD_MODULE(WeightedPSNR "WeightedPSNR")
|
||||
ADD_MODULE(HEVCIntraPrediction "HEVCIntraPrediction")
|
||||
ADD_MODULE(OptimiseDisplay "OptimiseDisplay")
|
||||
|
||||
ADD_MODULE_USE_OPENCV(MeasureOpticalFlowDualTVL1 "MeasureOpticalFlowDualTVL1" VERSION 2.4.13.0 MODULES video optflow)
|
||||
ADD_MODULE_USE_OPENCV(
|
||||
MeasureOpticalFlowDualTVL1
|
||||
"MeasureOpticalFlowDualTVL1"
|
||||
VERSION
|
||||
2.4.13.0
|
||||
MODULES
|
||||
video
|
||||
optflow
|
||||
)
|
||||
ADD_MODULE_USE_OPENCV(DisparityStereoBM "DisparityStereoBM" VERSION 2.4.13.0 MODULES calib3d)
|
||||
ADD_MODULE_USE_OPENCV(DisparityStereoSGBM "DisparityStereoSGBM" VERSION 2.4.13.0 MODULES calib3d)
|
||||
ADD_MODULE_USE_OPENCV(OpticalFlowDualTVL1 "OpticalFlow" VERSION 3.1.0 MODULES optflow)
|
||||
ADD_MODULE_USE_OPENCV(OpticalFlowSparseToDense "OpticalFlow" VERSION 3.1.0 MODULES optflow)
|
||||
ADD_MODULE_USE_OPENCV(OpticalFlowFarneback "OpticalFlow" VERSION 3.1.0 MODULES video optflow)
|
||||
ADD_MODULE_USE_OPENCV(OpticalDeepFlow "OpticalFlow" VERSION 3.1.0 MODULES video optflow)
|
||||
ADD_MODULE_USE_OPENCV(
|
||||
OpticalFlowFarneback
|
||||
"OpticalFlow"
|
||||
VERSION
|
||||
3.1.0
|
||||
MODULES
|
||||
video
|
||||
optflow
|
||||
)
|
||||
ADD_MODULE_USE_OPENCV(
|
||||
OpticalDeepFlow
|
||||
"OpticalFlow"
|
||||
VERSION
|
||||
3.1.0
|
||||
MODULES
|
||||
video
|
||||
optflow
|
||||
)
|
||||
ADD_MODULE_USE_OPENCV(SaliencyDetectionSpectral "SaliencyDetection" VERSION 3.3.0 MODULES saliency)
|
||||
ADD_MODULE_USE_OPENCV(SaliencyDetectionFineGrained "SaliencyDetection" VERSION 3.3.0 MODULES saliency)
|
||||
ADD_MODULE_USE_OPENCV(SaliencyDetectionBinWangApr2014 "SaliencyDetection" VERSION 3.3.0 MODULES saliency)
|
||||
@@ -61,7 +86,7 @@ ENDIF()
|
||||
#
|
||||
CREATE_MODULE_MACROS()
|
||||
INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS})
|
||||
ADD_LIBRARY(CalypModules ${Calyp_Mod_SRCS})
|
||||
ADD_LIBRARY(CalypModules STATIC ${Calyp_Mod_SRCS})
|
||||
TARGET_LINK_LIBRARIES(CalypModules ${PROJECT_LIBRARY} ${OpenCV_LIBRARIES})
|
||||
IF(USE_DYNLOAD)
|
||||
TARGET_LINK_LIBRARIES(CalypModules -ldl)
|
||||
|
||||
@@ -45,6 +45,7 @@ EightBitsSampling::EightBitsSampling()
|
||||
|
||||
bool EightBitsSampling::create( std::vector<CalypFrame*> apcFrameList )
|
||||
{
|
||||
_BASIC_MODULE_API_2_CHECK_
|
||||
m_iBitSifting = int( apcFrameList[0]->getBitsPel() ) - m_iNumberOfBits;
|
||||
if( !m_iBitSifting )
|
||||
return false;
|
||||
|
||||
@@ -71,6 +71,7 @@ FilterComponentLuma::FilterComponentLuma()
|
||||
|
||||
bool FilterComponentLuma::create( std::vector<CalypFrame*> apcFrameList )
|
||||
{
|
||||
_BASIC_MODULE_API_2_CHECK_
|
||||
return createFilter( apcFrameList[0]->getWidth(), apcFrameList[0]->getHeight(), apcFrameList[0]->getBitsPel() );
|
||||
}
|
||||
|
||||
@@ -88,6 +89,7 @@ FilterComponentChromaU::FilterComponentChromaU()
|
||||
|
||||
bool FilterComponentChromaU::create( std::vector<CalypFrame*> apcFrameList )
|
||||
{
|
||||
_BASIC_MODULE_API_2_CHECK_
|
||||
if( apcFrameList[0]->getNumberChannels() > 1 )
|
||||
{
|
||||
return createFilter( apcFrameList[0]->getWidth( CLP_CHROMA_U ), apcFrameList[0]->getHeight( CLP_CHROMA_U ),
|
||||
@@ -111,6 +113,7 @@ FilterComponentChromaV::FilterComponentChromaV()
|
||||
|
||||
bool FilterComponentChromaV::create( std::vector<CalypFrame*> apcFrameList )
|
||||
{
|
||||
_BASIC_MODULE_API_2_CHECK_
|
||||
if( apcFrameList[0]->getNumberChannels() > 1 )
|
||||
{
|
||||
return createFilter( apcFrameList[0]->getWidth( CLP_CHROMA_V ), apcFrameList[0]->getHeight( CLP_CHROMA_V ),
|
||||
|
||||
@@ -57,6 +57,7 @@ FrameResampling::FrameResampling()
|
||||
|
||||
bool FrameResampling::create( std::vector<CalypFrame*> apcFrameList )
|
||||
{
|
||||
_BASIC_MODULE_API_2_CHECK_
|
||||
switch( m_iInterpolation )
|
||||
{
|
||||
case 2:
|
||||
|
||||
@@ -62,6 +62,7 @@ HEVCIntraPrediction::HEVCIntraPrediction()
|
||||
|
||||
bool HEVCIntraPrediction::create( std::vector<CalypFrame*> apcFrameList )
|
||||
{
|
||||
_BASIC_MODULE_API_2_CHECK_
|
||||
m_pcPredBlock = NULL;
|
||||
m_pcPredBlock = new CalypFrame( m_iBlockSize * 2 + 1, m_iBlockSize * 2 + 1, CLP_GRAY, apcFrameList[0]->getBitsPel() );
|
||||
|
||||
|
||||
@@ -43,7 +43,9 @@ ThreeSixtyFaceConcatenation::ThreeSixtyFaceConcatenation()
|
||||
m_pchModuleName = "ThreeSixtyFaceConcatenation";
|
||||
m_pchModuleTooltip = "Concatenate 360 video faces";
|
||||
m_uiNumberOfFrames = 1;
|
||||
m_uiModuleRequirements = CLP_MODULE_REQUIRES_SKIP_WHILE_PLAY | CLP_MODULES_VARIABLE_NUM_FRAMES;
|
||||
m_uiModuleRequirements = CLP_MODULE_REQUIRES_SKIP_WHILE_PLAY |
|
||||
CLP_MODULE_REQUIRES_OPTIONS |
|
||||
CLP_MODULES_VARIABLE_NUM_FRAMES;
|
||||
|
||||
m_cModuleOptions.addOptions() /**/
|
||||
( "projection", m_uiProjectionType, "Projection [1] \n 1: Cubemap (6 faces)" ) /**/
|
||||
@@ -60,6 +62,8 @@ ThreeSixtyFaceConcatenation::ThreeSixtyFaceConcatenation()
|
||||
|
||||
bool ThreeSixtyFaceConcatenation::create( std::vector<CalypFrame*> apcFrameList )
|
||||
{
|
||||
if( apcFrameList.size() < 1 )
|
||||
return false;
|
||||
for( unsigned int i = 0; i < apcFrameList.size(); i++ )
|
||||
if( !apcFrameList[i] )
|
||||
return false;
|
||||
@@ -77,9 +81,12 @@ bool ThreeSixtyFaceConcatenation::create( std::vector<CalypFrame*> apcFrameList
|
||||
m_uiFacesY = 2 * m_uiNumberOfPartitionsPerFace;
|
||||
break;
|
||||
default:
|
||||
assert( 0 );
|
||||
return false;
|
||||
}
|
||||
|
||||
if( apcFrameList.size() != m_uiFacesX * m_uiFacesY )
|
||||
return false;
|
||||
|
||||
unsigned int width = apcFrameList[0]->getWidth() * m_uiFacesX;
|
||||
unsigned int height = apcFrameList[0]->getHeight() * m_uiFacesY;
|
||||
|
||||
|
||||
@@ -11,4 +11,10 @@ FOREACH(module ${MODULES_LIST_NAME})
|
||||
TARGET_COMPILE_DEFINITIONS(TestModuleCreate_${module} PUBLIC -DCALYP_TEST_MODULE_NAME=\"${module}\")
|
||||
TARGET_LINK_LIBRARIES(TestModuleCreate_${module} ${PROJECT_LIBRARY} CalypModules gtest gtest_main)
|
||||
ADD_TEST(TestModuleCreate_${module} TestModuleCreate_${module})
|
||||
|
||||
ADD_EXECUTABLE(TestModuleProcessNumberOfFrames_${module} TestModuleProcessNumberOfFrames.cpp)
|
||||
TARGET_COMPILE_DEFINITIONS(TestModuleProcessNumberOfFrames_${module} PUBLIC -DCALYP_TEST_MODULE_NAME=\"${module}\")
|
||||
TARGET_LINK_LIBRARIES(TestModuleProcessNumberOfFrames_${module} ${PROJECT_LIBRARY} CalypModules gtest gtest_main)
|
||||
ADD_TEST(TestModuleProcessNumberOfFrames_${module} TestModuleProcessNumberOfFrames_${module})
|
||||
|
||||
ENDFOREACH(module ${MODULES_LIST_NAME})
|
||||
@@ -19,13 +19,14 @@
|
||||
|
||||
/**
|
||||
* \file TestModuleCreate.cpp
|
||||
* \brief CalypModuleIf testing for YUV420p sequences
|
||||
* \brief CalypModuleIf testing create
|
||||
*/
|
||||
|
||||
#include "CalypFrame.h"
|
||||
#include "CalypModulesFactory.h"
|
||||
#include "CalypStream.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include "lib/CalypFrame.h"
|
||||
#include "lib/CalypModuleIf.h"
|
||||
#include "lib/CalypStream.h"
|
||||
#include "modules/CalypModulesFactory.h"
|
||||
|
||||
class TestModuleCreate : public ::testing::Test
|
||||
{
|
||||
@@ -35,6 +36,8 @@ protected:
|
||||
// Can be omitted if not needed.
|
||||
static void SetUpTestCase()
|
||||
{
|
||||
ClpString moduleName = CALYP_TEST_MODULE_NAME;
|
||||
|
||||
pcStream = new CalypStream;
|
||||
pcStream->open( ClpString( CALYP_TEST_DATA_DIR ) + ClpString( "/BasketballDrill_F10_832x480_yuv420p.yuv" ), 832, 480, 0, 8,
|
||||
CLP_BIG_ENDIAN, 1, true );
|
||||
@@ -50,66 +53,65 @@ protected:
|
||||
pcStream = NULL;
|
||||
}
|
||||
|
||||
// Some expensive resource shared by all tests.
|
||||
static CalypStream* pcStream;
|
||||
static CalypFrame* pcFrame;
|
||||
static CalypModuleIf* pcModule;
|
||||
static ClpString sModuleName;
|
||||
};
|
||||
|
||||
CalypStream* TestModuleCreate::pcStream = NULL;
|
||||
CalypFrame* TestModuleCreate::pcFrame = NULL;
|
||||
ClpString TestModuleCreate::sModuleName = CALYP_TEST_MODULE_NAME;
|
||||
|
||||
TEST_F( TestModuleCreate, FIND_MODULE )
|
||||
{
|
||||
CalypModuleIf* module;
|
||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
||||
for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
|
||||
// Called before each test
|
||||
void SetUp()
|
||||
{
|
||||
if( strcmp( it->first, sModuleName.c_str() ) == 0 )
|
||||
ClpString moduleName = CALYP_TEST_MODULE_NAME;
|
||||
|
||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
||||
for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
|
||||
{
|
||||
module = it->second();
|
||||
break;
|
||||
if( strcmp( it->first, moduleName.c_str() ) == 0 )
|
||||
{
|
||||
pcModule = it->second();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
EXPECT_NE( module, nullptr );
|
||||
module->Delete();
|
||||
void TearDown()
|
||||
{
|
||||
pcModule->Delete();
|
||||
}
|
||||
|
||||
CalypModuleIf* pcModule;
|
||||
|
||||
// Some expensive resource shared by all tests.
|
||||
static CalypStream* pcStream;
|
||||
};
|
||||
|
||||
CalypStream* TestModuleCreate::pcStream = NULL;
|
||||
|
||||
TEST_F( TestModuleCreate, FIND_MODULE )
|
||||
{
|
||||
EXPECT_NE( pcModule, nullptr );
|
||||
}
|
||||
|
||||
TEST_F( TestModuleCreate, CREATE_OK )
|
||||
{
|
||||
CalypModuleIf* module;
|
||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
||||
for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
|
||||
bool moduleRequireOptions = false;
|
||||
if( pcModule->m_uiModuleRequirements & CLP_MODULE_REQUIRES_OPTIONS )
|
||||
{
|
||||
if( strcmp( it->first, sModuleName.c_str() ) == 0 )
|
||||
{
|
||||
module = it->second();
|
||||
break;
|
||||
}
|
||||
moduleRequireOptions = true;
|
||||
}
|
||||
EXPECT_NE( module, nullptr );
|
||||
|
||||
bool moduleCreated = false;
|
||||
std::vector<CalypFrame*> apcFrameList;
|
||||
apcFrameList.clear();
|
||||
for( unsigned int i = 0; i < module->m_uiNumberOfFrames; i++ )
|
||||
for( unsigned int i = 0; i < pcModule->m_uiNumberOfFrames; i++ )
|
||||
{
|
||||
apcFrameList.push_back( pcStream->getCurrFrame() );
|
||||
pcStream->setNextFrame();
|
||||
pcStream->readNextFrame();
|
||||
}
|
||||
if( module->m_iModuleAPI >= CLP_MODULE_API_2 )
|
||||
if( pcModule->m_iModuleAPI >= CLP_MODULE_API_2 )
|
||||
{
|
||||
moduleCreated = module->create( apcFrameList );
|
||||
moduleCreated = pcModule->create( apcFrameList ) | moduleRequireOptions;
|
||||
}
|
||||
else if( module->m_iModuleAPI == CLP_MODULE_API_1 )
|
||||
else if( pcModule->m_iModuleAPI == CLP_MODULE_API_1 )
|
||||
{
|
||||
module->create( pcStream->getCurrFrame() );
|
||||
pcModule->create( pcStream->getCurrFrame() );
|
||||
moduleCreated = true;
|
||||
}
|
||||
EXPECT_EQ( moduleCreated, true );
|
||||
@@ -117,72 +119,47 @@ TEST_F( TestModuleCreate, CREATE_OK )
|
||||
|
||||
TEST_F( TestModuleCreate, CREATE_FAIL_LESS_ONE )
|
||||
{
|
||||
CalypModuleIf* module;
|
||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
||||
for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
|
||||
if( pcModule->m_iModuleAPI >= CLP_MODULE_API_2 )
|
||||
{
|
||||
if( strcmp( it->first, sModuleName.c_str() ) == 0 )
|
||||
std::vector<CalypFrame*> apcFrameList;
|
||||
apcFrameList.clear();
|
||||
for( unsigned int i = 0; i < pcModule->m_uiNumberOfFrames - 1; i++ )
|
||||
{
|
||||
module = it->second();
|
||||
break;
|
||||
apcFrameList.push_back( pcStream->getCurrFrame() );
|
||||
pcStream->setNextFrame();
|
||||
pcStream->readNextFrame();
|
||||
}
|
||||
bool moduleCreated = pcModule->create( apcFrameList );
|
||||
EXPECT_NE( moduleCreated, true );
|
||||
}
|
||||
EXPECT_NE( module, nullptr );
|
||||
|
||||
bool moduleCreated = false;
|
||||
std::vector<CalypFrame*> apcFrameList;
|
||||
apcFrameList.clear();
|
||||
for( unsigned int i = 0; i < module->m_uiNumberOfFrames - 1; i++ )
|
||||
{
|
||||
apcFrameList.push_back( pcStream->getCurrFrame() );
|
||||
pcStream->setNextFrame();
|
||||
pcStream->readNextFrame();
|
||||
}
|
||||
if( module->m_iModuleAPI >= CLP_MODULE_API_2 )
|
||||
{
|
||||
moduleCreated = module->create( apcFrameList );
|
||||
}
|
||||
else if( module->m_iModuleAPI == CLP_MODULE_API_1 )
|
||||
{
|
||||
module->create( pcStream->getCurrFrame() );
|
||||
moduleCreated = true;
|
||||
}
|
||||
EXPECT_NE( moduleCreated, true );
|
||||
}
|
||||
|
||||
TEST_F( TestModuleCreate, CREATE_FAIL_PLUS_ONE )
|
||||
{
|
||||
CalypModuleIf* module;
|
||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
||||
for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
|
||||
if( pcModule->m_iModuleAPI >= CLP_MODULE_API_2 )
|
||||
{
|
||||
if( strcmp( it->first, sModuleName.c_str() ) == 0 )
|
||||
std::vector<CalypFrame*> apcFrameList;
|
||||
apcFrameList.clear();
|
||||
for( unsigned int i = 0; i < pcModule->m_uiNumberOfFrames + 1; i++ )
|
||||
{
|
||||
module = it->second();
|
||||
break;
|
||||
apcFrameList.push_back( NULL );
|
||||
}
|
||||
bool moduleCreated = pcModule->create( apcFrameList );
|
||||
EXPECT_NE( moduleCreated, true );
|
||||
}
|
||||
EXPECT_NE( module, nullptr );
|
||||
}
|
||||
|
||||
bool moduleCreated = false;
|
||||
std::vector<CalypFrame*> apcFrameList;
|
||||
apcFrameList.clear();
|
||||
for( unsigned int i = 0; i < module->m_uiNumberOfFrames + 1; i++ )
|
||||
TEST_F( TestModuleCreate, CREATE_FAIL_NULL_FRAME )
|
||||
{
|
||||
if( pcModule->m_iModuleAPI >= CLP_MODULE_API_2 )
|
||||
{
|
||||
apcFrameList.push_back( pcStream->getCurrFrame() );
|
||||
pcStream->setNextFrame();
|
||||
pcStream->readNextFrame();
|
||||
std::vector<CalypFrame*> apcFrameList;
|
||||
apcFrameList.clear();
|
||||
for( unsigned int i = 0; i < pcModule->m_uiNumberOfFrames - 1; i++ )
|
||||
{
|
||||
apcFrameList.push_back( NULL );
|
||||
}
|
||||
bool moduleCreated = pcModule->create( apcFrameList );
|
||||
EXPECT_NE( moduleCreated, true );
|
||||
}
|
||||
if( module->m_iModuleAPI >= CLP_MODULE_API_2 )
|
||||
{
|
||||
moduleCreated = module->create( apcFrameList );
|
||||
}
|
||||
else if( module->m_iModuleAPI == CLP_MODULE_API_1 )
|
||||
{
|
||||
module->create( pcStream->getCurrFrame() );
|
||||
moduleCreated = true;
|
||||
}
|
||||
EXPECT_NE( moduleCreated, true );
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,110 @@
|
||||
/* This file is a part of plaYUVer project
|
||||
* Copyright (C) 2014-2021 by Joao Carreira (jfmcarreira@gmail.com)
|
||||
* Luis Lucas (luisfrlucas@gmail.com)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file TestModuleCreate.cpp
|
||||
* \brief CalypModuleIf testing for YUV420p sequences
|
||||
*/
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
#include "lib/CalypFrame.h"
|
||||
#include "lib/CalypModuleIf.h"
|
||||
#include "lib/CalypStream.h"
|
||||
#include "modules/CalypModulesFactory.h"
|
||||
|
||||
class TestModuleProcessNumberOfFrames : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
// Per-test-case set-up.
|
||||
// Called before the first test in this test case.
|
||||
// Can be omitted if not needed.
|
||||
static void SetUpTestCase()
|
||||
{
|
||||
ClpString moduleName = CALYP_TEST_MODULE_NAME;
|
||||
|
||||
pcStream = new CalypStream;
|
||||
pcStream->open( ClpString( CALYP_TEST_DATA_DIR ) + ClpString( "/BasketballDrill_F10_832x480_yuv420p.yuv" ), 832, 480, 0, 8,
|
||||
CLP_BIG_ENDIAN, 1, true );
|
||||
}
|
||||
|
||||
// Per-test-case tear-down.
|
||||
// Called after the last test in this test case.
|
||||
// Can be omitted if not needed.
|
||||
static void TearDownTestCase()
|
||||
{
|
||||
pcStream->close();
|
||||
delete pcStream;
|
||||
pcStream = NULL;
|
||||
}
|
||||
|
||||
// Called before each test
|
||||
void SetUp()
|
||||
{
|
||||
ClpString moduleName = CALYP_TEST_MODULE_NAME;
|
||||
|
||||
pcStream = new CalypStream;
|
||||
pcStream->open( ClpString( CALYP_TEST_DATA_DIR ) + ClpString( "/BasketballDrill_F10_832x480_yuv420p.yuv" ), 832, 480, 0, 8,
|
||||
CLP_BIG_ENDIAN, 1, true );
|
||||
|
||||
CalypModulesFactoryMap& moduleFactoryMap = CalypModulesFactory::Get()->getMap();
|
||||
CalypModulesFactoryMap::iterator it = moduleFactoryMap.begin();
|
||||
for( unsigned int i = 0; it != moduleFactoryMap.end(); ++it, i++ )
|
||||
{
|
||||
if( strcmp( it->first, moduleName.c_str() ) == 0 )
|
||||
{
|
||||
pcModule = it->second();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void TearDown()
|
||||
{
|
||||
pcModule->Delete();
|
||||
}
|
||||
|
||||
CalypModuleIf* pcModule;
|
||||
|
||||
// Some expensive resource shared by all tests.
|
||||
static CalypStream* pcStream;
|
||||
};
|
||||
|
||||
CalypStream* TestModuleProcessNumberOfFrames::pcStream = NULL;
|
||||
|
||||
TEST_F( TestModuleProcessNumberOfFrames, PROCESS_OK )
|
||||
{
|
||||
if( pcModule->m_iModuleAPI >= CLP_MODULE_API_2 )
|
||||
{
|
||||
std::vector<CalypFrame*> apcFrameList;
|
||||
apcFrameList.clear();
|
||||
for( unsigned int i = 0; i < pcModule->m_uiNumberOfFrames; i++ )
|
||||
{
|
||||
apcFrameList.push_back( pcStream->getCurrFrame() );
|
||||
pcStream->setNextFrame();
|
||||
pcStream->readNextFrame();
|
||||
}
|
||||
|
||||
// Let's not test the modules that are not able to be created
|
||||
if( pcModule->create( apcFrameList ) )
|
||||
{
|
||||
CalypFrame* frame = pcModule->process( apcFrameList );
|
||||
EXPECT_NE( frame, nullptr );
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
git checkout upstream
|
||||
git pull https://github.com/pixlra/calyp.git master
|
||||
git push origin upstream
|
||||
|
||||
git checkout master
|
||||
git pull origin master
|
||||
git merge upstream
|
||||
git push origin master
|
||||
Reference in new issue
Block a user