Reorganize video decoder sources

Signed-off-by: Joaquin Anton Guirao <[email protected]>

Author: jantonguirao

dali/operators/CMakeLists.txt

@@ -22,7 +22,6 @@ add_subdirectory(decoder)
 add_subdirectory(generic)
 add_subdirectory(image)
 add_subdirectory(imgcodec)
-add_subdirectory(input)
 add_subdirectory(io)
 add_subdirectory(math)
 add_subdirectory(random)
@@ -39,6 +38,9 @@ endif()
 if (BUILD_PYTHON)
   add_subdirectory(python_function)
 endif()
+if (BUILD_NVDEC)
+  add_subdirectory(video)
+endif()
 
 # Get all the source files and dump test files
 collect_headers(DALI_INST_HDRS PARENT_SCOPE)
@@ -65,7 +67,7 @@ if (NOT OPERATOR_SRCS_PATTERN STREQUAL "" OR
   # Those are needed for operators.cc to have all symbols
   list(APPEND EXTRA_FILES "${CMAKE_CURRENT_SOURCE_DIR}/util/npp.cc")
   list(APPEND EXTRA_FILES "${CMAKE_CURRENT_SOURCE_DIR}/decoder/nvjpeg/nvjpeg_helper.cc")
-  list(APPEND EXTRA_FILES "${CMAKE_CURRENT_SOURCE_DIR}/reader/nvdecoder/dynlink_nvcuvid.cc")
+  list(APPEND EXTRA_FILES "${CMAKE_CURRENT_SOURCE_DIR}/video/dynlink_nvcuvid/dynlink_nvcuvid.cc")
 
   list(APPEND OPERATOR_SRCS_PATTERN_EXCLUDE "*test*")
   custom_filter(CMAKE_CURRENT_SOURCE_DIR

dali/operators/decoder/CMakeLists.txt

@@ -24,10 +24,6 @@ if (BUILD_NVJPEG)
   add_subdirectory(nvjpeg)
 endif()
 
-if (BUILD_FFMPEG)
-  add_subdirectory(video)
-endif()
-
 if (BUILD_NVCOMP)
   add_subdirectory(inflate)
 endif()

dali/operators/input/CMakeLists.txt

@@ -14,9 +14,6 @@
 
 add_subdirectory(loader)
 add_subdirectory(parser)
-if (BUILD_NVDEC)
-  add_subdirectory(nvdecoder)
-endif()
 
 collect_headers(DALI_INST_HDRS PARENT_SCOPE) # TODO (ONLY SUPPORTED ONES)
 
@@ -36,19 +33,6 @@ endif()
 
 list(APPEND DALI_OPERATOR_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/sequence_reader_op.cc")
 
-if (BUILD_FFMPEG)
-  list(APPEND DALI_OPERATOR_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/video_reader_decoder_cpu_op.cc")
-endif()
-
-if (BUILD_NVDEC)
-  list(APPEND DALI_OPERATOR_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/video_reader_op.cc")
-  list(APPEND DALI_OPERATOR_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/video_reader_resize_op.cc")
-  list(APPEND DALI_OPERATOR_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/video_reader_decoder_gpu_op.cc")
-  if (BUILD_TEST)
-    list(APPEND DALI_OPERATOR_TEST_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/video_reader_decoder_op_test.cc")
-  endif()
-endif()
-
 if (BUILD_LIBTAR)
   list(APPEND DALI_OPERATOR_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/webdataset_reader_op.cc")
 endif()
@@ -80,8 +64,5 @@ if (BUILD_TEST)
   if(BUILD_CUFILE)
     list(APPEND DALI_OPERATOR_TEST_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/gds_mem_test.cu")
   endif()
-  if(BUILD_NVDEC)
-    list(APPEND DALI_OPERATOR_TEST_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/video_reader_op_test.cc")
-  endif()
   set(DALI_OPERATOR_TEST_SRCS ${DALI_OPERATOR_TEST_SRCS} PARENT_SCOPE)
 endif()

dali/operators/reader/CMakeLists.txt

@@ -16,10 +16,6 @@ if (BUILD_LIBTAR)
   add_subdirectory(webdataset)
 endif()
 
-if (BUILD_FFMPEG)
-  add_subdirectory(video)
-endif()
-
 # Get all the source files and dump test files
 collect_headers(DALI_INST_HDRS PARENT_SCOPE)
 
@@ -50,11 +46,6 @@ if (BUILD_LIBSND)
     "${CMAKE_CURRENT_SOURCE_DIR}/nemo_asr_loader.cc")
 endif()
 
-if (BUILD_NVDEC)
-  set(DALI_OPERATOR_SRCS ${DALI_OPERATOR_SRCS}
-    "${CMAKE_CURRENT_SOURCE_DIR}/video_loader.cc")
-endif()
-
 set(DALI_OPERATOR_TEST_SRCS ${DALI_OPERATOR_TEST_SRCS}
   "${CMAKE_CURRENT_SOURCE_DIR}/loader_test.cc"
   "${CMAKE_CURRENT_SOURCE_DIR}/sequence_loader_test.cc"