Rename nvpipe files

components/codecs/CMakeLists.txt

@@ -13,7 +13,6 @@ target_include_directories(BaseCodec PUBLIC
 	${CMAKE_CURRENT_SOURCE_DIR}/src/Video_Codec_SDK_9.1.23/include
 	${CMAKE_CURRENT_SOURCE_DIR}/src/Video_Codec_SDK_9.1.23/Samples/NvCodec
 	$<TARGET_PROPERTY:ftlcommon,INTERFACE_INCLUDE_DIRECTORIES>
-	#$<TARGET_PROPERTY:NvPipe,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
 add_library(OpenCVCodec OBJECT	
@@ -30,23 +29,20 @@ $<TARGET_OBJECTS:BaseCodec>
 $<TARGET_OBJECTS:OpenCVCodec>
 )
 
-if (HAVE_NVPIPE)
-	add_library(NvPipeCodec OBJECT	
-		src/nvpipe_encoder.cpp
-		src/nvpipe_decoder.cpp
+add_library(NvidiaCodec OBJECT	
+	src/nvidia_encoder.cpp
+	src/nvidia_decoder.cpp
 	src/Video_Codec_SDK_9.1.23/Samples/NvCodec/NvDecoder/NvDecoder.cpp
 	src/Video_Codec_SDK_9.1.23/Samples/NvCodec/NvEncoder/NvEncoder.cpp
 	src/Video_Codec_SDK_9.1.23/Samples/NvCodec/NvEncoder/NvEncoderCuda.cpp
 )
-	target_include_directories(NvPipeCodec PUBLIC
+target_include_directories(NvidiaCodec PUBLIC
 	${CMAKE_CURRENT_SOURCE_DIR}/include
 	${CMAKE_CURRENT_SOURCE_DIR}/src/Video_Codec_SDK_9.1.23/include
 	${CMAKE_CURRENT_SOURCE_DIR}/src/Video_Codec_SDK_9.1.23/Samples/NvCodec
 	$<TARGET_PROPERTY:ftlcommon,INTERFACE_INCLUDE_DIRECTORIES>
-		#$<TARGET_PROPERTY:NvPipe,INTERFACE_INCLUDE_DIRECTORIES>
 )
-	list(APPEND CODECSRC $<TARGET_OBJECTS:NvPipeCodec>)
-endif()
+list(APPEND CODECSRC $<TARGET_OBJECTS:NvidiaCodec>)
 
 add_library(ftlcodecs ${CODECSRC})
 

components/codecs/test/CMakeLists.txt

@@ -15,32 +15,32 @@ target_link_libraries(opencv_codec_unit
 add_test(OpenCVCodecUnitTest opencv_codec_unit)
 
 
-### NvPipe Codec Unit ################################################################
-add_executable(nvpipe_codec_unit
+### Nvidia Codec Unit ################################################################
+add_executable(nvidia_codec_unit
 $<TARGET_OBJECTS:CatchTest>
 	../src/bitrates.cpp
 	../src/encoder.cpp
 	#../src/nvpipe_encoder.cpp
 	#../src/nvpipe_decoder.cpp
-	$<TARGET_OBJECTS:NvPipeCodec>
+	$<TARGET_OBJECTS:NvidiaCodec>
 	../src/depth_convert.cu
-	./nvpipe_codec_unit.cpp
+	./nvidia_codec_unit.cpp
 )
 if (WIN32)
 	if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-		target_link_directories(nvpipe_codec_unit PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../src/Video_Codec_SDK_9.1.23/Lib/x64)
+		target_link_directories(nvidia_codec_unit PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../src/Video_Codec_SDK_9.1.23/Lib/x64)
 	elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
-		target_link_directories(nvpipe_codec_unit PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../src/Video_Codec_SDK_9.1.23/Lib/Win32)
+		target_link_directories(nvidia_codec_unit PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../src/Video_Codec_SDK_9.1.23/Lib/Win32)
 	endif()
 endif()
-target_include_directories(nvpipe_codec_unit PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../include"
+target_include_directories(nvidia_codec_unit PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../include"
 ${CMAKE_CURRENT_SOURCE_DIR}/../src/Video_Codec_SDK_9.1.23/include
 ${CMAKE_CURRENT_SOURCE_DIR}/../src/Video_Codec_SDK_9.1.23/Samples/NvCodec)
-target_link_libraries(nvpipe_codec_unit
+target_link_libraries(nvidia_codec_unit
 	Threads::Threads ${OS_LIBS} ${OpenCV_LIBS} ${CUDA_LIBRARIES} ftlcommon nvcuvid cuda)
 
 
-add_test(NvPipeCodecUnitTest nvpipe_codec_unit)
+add_test(NvidiaCodecUnitTest nvidia_codec_unit)
 
 ### Reader Writer Unit ################################################################
 #add_executable(rw_unit