From 11504d2f0f71c636bbd5b3c1a4c8a04852b5d601 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Fri, 22 Apr 2016 23:01:23 +0100 Subject: [PATCH] Clean up old code --- cmake/Win32.cmake | 7 ------ config.h.in | 7 +----- lib/CMakeLists.txt | 10 -------- lib/PlaYUVerFrame.cpp | 55 ------------------------------------------- lib/PlaYUVerFrame.h | 5 +--- 5 files changed, 2 insertions(+), 82 deletions(-) diff --git a/cmake/Win32.cmake b/cmake/Win32.cmake index bd37a98..833bbce 100644 --- a/cmake/Win32.cmake +++ b/cmake/Win32.cmake @@ -9,8 +9,6 @@ foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} ) set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "." ) endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES ) -set(CMAKE_STATIC_LIBRARY_PREFIX "lib") - SET(MSVC_DLL_DIR "MSVC_DLL_DIR" 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 ) @@ -41,9 +39,7 @@ IF( USE_OPENCV ) IF( WIN32 ) SET(OpenCV_DLL_DIR "${OpenCV_DIR}/bin" CACHE PATH "Where to find OpenCV dlls") INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_core${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) - INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_contrib${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_highgui${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) - INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_contrib${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_imgproc${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_calib3d${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_features2d${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) @@ -55,9 +51,6 @@ IF( USE_OPENCV ) INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_stitching${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_photo${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_objdetect${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) - INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_nonfree${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) - INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_legacy${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) - INSTALL(FILES ${OpenCV_DLL_DIR}/opencv_gpu${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}.dll DESTINATION bin ) ENDIF() LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS ",") LIST(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "libopencv-dev (>= 2.4.8)") diff --git a/config.h.in b/config.h.in index 7203346..20642c7 100644 --- a/config.h.in +++ b/config.h.in @@ -54,11 +54,9 @@ /* Dynamic Modules Loading */ #cmakedefine USE_DYNLOAD +/* Use modules in a different thread */ #cmakedefine PLAYUVER_THREADED_MODULES -/* Boost support */ -#cmakedefine USE_BOOST - /* OpenCV */ #cmakedefine USE_OPENCV @@ -68,8 +66,5 @@ /* Fervor update lib */ #cmakedefine USE_FERVOR -/* PIXFC-SSE lib */ -#cmakedefine USE_PIXFC - #endif // __CONFIG_PLAYUVER_H__ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 2f4ebc9..2d569ae 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -36,16 +36,6 @@ set(PlaYUVer_Lib_HEADERS PlaYUVerModuleIf.h ) -# OPTION( USE_PIXFC "Add PIXFC support" OFF ) -# IF( USE_PIXFC ) -# IF(EXISTS "${EXTERNAL_SRC}/pixfc-sse/build/src/libpixfc-sse.a") -# INCLUDE_DIRECTORIES( ${EXTERNAL_SRC}/pixfc-sse/include ) -# LIST(APPEND LINKER_LIBS ${EXTERNAL_SRC}/pixfc-sse/build/src/libpixfc-sse.a ) -# LIST(APPEND LINKER_LIBS rt) -# ELSE() -# SET( USE_PIXFC OFF ) -# ENDIF() -# ENDIF() CONFIGURE_FILE( PlaYUVerConfig.cmake.in PlaYUVerConfig.cmake @ONLY) diff --git a/lib/PlaYUVerFrame.cpp b/lib/PlaYUVerFrame.cpp index 8d81865..c1478bb 100644 --- a/lib/PlaYUVerFrame.cpp +++ b/lib/PlaYUVerFrame.cpp @@ -35,9 +35,6 @@ #ifdef USE_OPENCV #include "StreamHandlerOpenCV.h" #endif -#ifdef USE_PIXFC -#include "pixfc-sse.h" -#endif namespace plaYUVer { @@ -125,8 +122,6 @@ PlaYUVerFrame::~PlaYUVerFrame() if( m_pcARGB32 ) freeMem1D( m_pcARGB32 ); m_pcARGB32 = NULL; - - closePixfc(); } static Int getMem3ImageComponents( Pel**** array3D, Int dim1, Int dim2, Int log2ChromaHeight, Int log2ChromaWidth ) @@ -927,56 +922,6 @@ Double PlaYUVerFrame::getMaximum( Int channel ) ************************************************************** */ -Void PlaYUVerFrame::openPixfc() -{ -#ifdef USE_PIXFC - m_pcPixfc = NULL; - PixFcPixelFormat input_format = PixFcYUV420P; - PixFcFlag flags = ( PixFcFlag )( PixFcFlag_Default + PixFcFlag_NNbResamplingOnly ); - UInt input_row_size = m_uiWidth; - if( create_pixfc( &m_pcPixfc, input_format, PixFcRGB24, m_uiWidth, m_uiHeight, input_row_size, m_uiWidth * 3, flags ) != 0 ) - { - fprintf( stderr, "Error creating struct pixfc\n" ); - m_pcPixfc = NULL; - return; - } -#endif -} - -Void PlaYUVerFrame::closePixfc() -{ -#ifdef USE_PIXFC - if( m_pcPixfc ) - destroy_pixfc( m_pcPixfc ); -#endif -} - -Void PlaYUVerFrame::FrametoRGB8Pixfc() -{ -#ifdef USE_PIXFC - switch( m_iPixelFormat ) - { - case YUV420p: - m_pcPixfc->convert( m_pcPixfc, m_pppcInputPel, m_pcRGB32 ); - break; - case YUV422p: - break; - case YUV444p: - case YUYV422: - m_pcPixfc->convert( m_pcPixfc, m_pppcInputPel, m_pcRGB32 ); - break; - case GRAY: - break; - case RGB8: - break; - default: - // No action. - break; - } - m_bHasRGBPel = true; -#endif -} - cv::Mat* PlaYUVerFrame::getCvMat( Bool convertToGray ) { #ifdef USE_OPENCV diff --git a/lib/PlaYUVerFrame.h b/lib/PlaYUVerFrame.h index 98e5ff6..317ae1f 100644 --- a/lib/PlaYUVerFrame.h +++ b/lib/PlaYUVerFrame.h @@ -33,7 +33,7 @@ #include "PlaYUVerDefs.h" #include "PlaYUVerPixel.h" -class PixFcSSE; + namespace cv { class Mat; @@ -335,9 +335,6 @@ private: */ Void init( UInt width, UInt height, Int pel_format, Int bitsPixel, Int endianness ); - Void openPixfc(); - Void closePixfc(); - PixFcSSE* m_pcPixfc; Void FrametoRGB8Pixfc(); };