OpenSourceJoker/video2x
3
0
Fork 0
mirror of https://github.com/k4yt3x/video2x.git synced 2024-12-28 23:19:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore(video2x): moved the CLI application to a separate directory

Browse Source 
Signed-off-by: k4yt3x <i@k4yt3x.com>
This commit is contained in:
k4yt3x 2024-11-08 00:00:00 +00:00
parent bc8ae34dde
commit e07beb67a4
No known key found for this signature in database
4 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
CMakeLists.txt
View File

@ -308,17 +308,8 @@ list(REMOVE_DUPLICATES ALL_INCLUDE_DIRS)
list(REMOVE_DUPLICATES ALL_LIBRARIES) list(REMOVE_DUPLICATES ALL_LIBRARIES)
# Create the shared library 'libvideo2x' # Create the shared library 'libvideo2x'
add_library(libvideo2x file(GLOB LIBVIDEO2X_SOURCES src/*.cpp)
src/avutils.cpp add_library(libvideo2x ${LIBVIDEO2X_SOURCES})
src/conversions.cpp
src/decoder.cpp
src/encoder.cpp
src/fsutils.cpp
src/libplacebo.cpp
src/libplacebo_filter.cpp
src/libvideo2x.cpp
src/realesrgan_filter.cpp
)
target_compile_definitions(libvideo2x PRIVATE LIBVIDEO2X_EXPORTS) target_compile_definitions(libvideo2x PRIVATE LIBVIDEO2X_EXPORTS)
if(WIN32) if(WIN32)
set_target_properties(libvideo2x PROPERTIES OUTPUT_NAME libvideo2x) set_target_properties(libvideo2x PROPERTIES OUTPUT_NAME libvideo2x)
@ -367,7 +358,8 @@ endif()
# Create the executable 'video2x' # Create the executable 'video2x'
if (BUILD_VIDEO2X_CLI) if (BUILD_VIDEO2X_CLI)
add_executable(video2x src/video2x.cpp src/timer.cpp) file(GLOB VIDEO2X_SOURCES tools/video2x/src/*.cpp)
add_executable(video2x ${VIDEO2X_SOURCES})
set_target_properties(video2x PROPERTIES OUTPUT_NAME video2x) set_target_properties(video2x PROPERTIES OUTPUT_NAME video2x)
# Include directories for the executable # Include directories for the executable
@ -376,6 +368,7 @@ if (BUILD_VIDEO2X_CLI)
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/include
${PROJECT_SOURCE_DIR}/include/libvideo2x ${PROJECT_SOURCE_DIR}/include/libvideo2x
${PROJECT_SOURCE_DIR}/tools/video2x/include
) )
# Compile options for the executable # Compile options for the executable
@ -442,23 +435,18 @@ install(FILES
# Platform-specific installation rules # Platform-specific installation rules
if(WIN32) if(WIN32)
# Install Windows-specific dependencies
if(CMAKE_BUILD_TYPE STREQUAL "Release") if(CMAKE_BUILD_TYPE STREQUAL "Release")
set(BOOST_DLL_PATH ${BOOST_BASE_PATH}/boost_program_options-vc143-mt-x64-1_86.dll) set(BOOST_DLL_PATH ${BOOST_BASE_PATH}/boost_program_options-vc143-mt-x64-1_86.dll)
else() else()
set(BOOST_DLL_PATH ${BOOST_BASE_PATH}/boost_program_options-vc143-mt-gd-x64-1_86.dll) set(BOOST_DLL_PATH ${BOOST_BASE_PATH}/boost_program_options-vc143-mt-gd-x64-1_86.dll)
endif() endif()
# Find all FFmpeg DLLs
file(GLOB FFMPEG_DLLS "${FFMPEG_BASE_PATH}/bin/*.dll")
install(FILES install(FILES
${CMAKE_BINARY_DIR}/realesrgan_install/bin/librealesrgan-ncnn-vulkan.dll ${CMAKE_BINARY_DIR}/realesrgan_install/bin/librealesrgan-ncnn-vulkan.dll
${FFMPEG_BASE_PATH}/bin/swscale-8.dll ${FFMPEG_DLLS}
${FFMPEG_BASE_PATH}/bin/avcodec-61.dll
${FFMPEG_BASE_PATH}/bin/avdevice-61.dll
${FFMPEG_BASE_PATH}/bin/avfilter-10.dll
${FFMPEG_BASE_PATH}/bin/avformat-61.dll
${FFMPEG_BASE_PATH}/bin/avutil-59.dll
${FFMPEG_BASE_PATH}/bin/postproc-58.dll
${FFMPEG_BASE_PATH}/bin/swresample-5.dll
# ${OPENCV_BASE_PATH}/build/x64/vc16/bin/opencv_world4100.dll # ${OPENCV_BASE_PATH}/build/x64/vc16/bin/opencv_world4100.dll
# ${OPENCV_BASE_PATH}/build/x64/vc16/bin/opencv_videoio_msmf4100_64.dll # ${OPENCV_BASE_PATH}/build/x64/vc16/bin/opencv_videoio_msmf4100_64.dll
${NCNN_BASE_PATH}/bin/ncnn.dll ${NCNN_BASE_PATH}/bin/ncnn.dll
@ -469,7 +457,6 @@ if(WIN32)
WORLD_READ WORLD_EXECUTE WORLD_READ WORLD_EXECUTE
) )
else() else()
# Install Unix-specific dependencies
install(FILES ${REALESRGAN_LIB} install(FILES ${REALESRGAN_LIB}
DESTINATION ${INSTALL_LIB_DESTINATION} DESTINATION ${INSTALL_LIB_DESTINATION}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE

0
include/libvideo2x/timer.h → tools/video2x/include/timer.h
View File

0
src/timer.cpp → tools/video2x/src/timer.cpp
View File

2
src/video2x.cpp → tools/video2x/src/video2x.cpp
View File

@ -45,7 +45,7 @@ extern "C" {
namespace po = boost::program_options; namespace po = boost::program_options;
#include "libvideo2x/char_defs.h" #include "libvideo2x/char_defs.h"
#include "libvideo2x/timer.h" #include "timer.h"
// Indicate if a newline needs to be printed before the next output // Indicate if a newline needs to be printed before the next output
std::atomic<bool> newline_required = false; std::atomic<bool> newline_required = false;