Add imgcodec decoder

Signed-off-by: Szymon Karpiński <skarpinski@nvidia.com>

Author: szkarpinski

dali/imgcodec/decoders/decoder_impl.h

@@ -98,8 +98,11 @@ class DLL_PUBLIC ImageDecoderImpl : public ImageDecoderInstance {
 
   int SetParams(const std::map<std::string, any> &params) override {
     int ret = 0;
-    for (auto &[key, value] : params)
+    for (auto p : params) {
+      auto key = p.first;
+      auto value = p.second;
       ret += SetParam(key.c_str(), value);
+    }
     return ret;
   }
 

dali/imgcodec/decoders/nvjpeg/nvjpeg.cc

@@ -206,6 +206,7 @@ void NvJpegDecoderInstance::DecodeJpegSample(ImageSource& in, uint8_t *out, Deco
   auto& decode_event = ctx.resources.decode_event;
   auto& device_buffer = ctx.resources.device_buffer;
 
+  CUDA_CALL(cudaEventSynchronize(decode_event));
   CUDA_CALL(nvjpegStateAttachPinnedBuffer(state, ctx.resources.pinned_buffer));
   CUDA_CALL(nvjpegJpegStreamParse(nvjpeg_handle_, in.RawData<unsigned char>(), in.Size(),
                                   false, false, ctx.resources.jpeg_stream));
@@ -217,7 +218,7 @@ void NvJpegDecoderInstance::DecodeJpegSample(ImageSource& in, uint8_t *out, Deco
   nvjpeg_image.channel[0] = out;
   nvjpeg_image.pitch[0] = ctx.shape[1] * ctx.shape[2];
 
-  CUDA_CALL(cudaEventSynchronize(decode_event));
+
   CUDA_CALL(nvjpegStateAttachDeviceBuffer(state, device_buffer));
   CUDA_CALL(nvjpegDecodeJpegTransferToDevice(nvjpeg_handle_, decoder, state, jpeg_stream,
                                              stream));

dali/imgcodec/parsers/jpeg.cc

@@ -77,7 +77,7 @@ ImageInfo JpegParser::GetInfo(ImageSource *encoded) const {
       stream->Read(exif_block.data(), size - 8);
       cv::ExifReader reader;
       if (!reader.parseExif(exif_block.data(), exif_block.size()))
-        DALI_FAIL(make_string("Couldn't parse EXIF data in: ", encoded->SourceInfo()));
+        continue;
       auto entry = reader.getTag(cv::ORIENTATION);
       if (entry.tag != cv::INVALID_TAG) {
         info.orientation = FromExifOrientation(static_cast<ExifOrientation>(entry.field_u16));

dali/operators/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2018, 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2017-2018, 2021-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ add_subdirectory(debug)
 add_subdirectory(decoder)
 add_subdirectory(generic)
 add_subdirectory(image)
+add_subdirectory(imgcodec)
 add_subdirectory(math)
 add_subdirectory(random)
 add_subdirectory(reader)
@@ -84,7 +85,7 @@ adjust_source_file_language_property("${DALI_OPERATOR_SRCS}")
 add_library(dali_operators ${LIBTYPE} ${DALI_OPERATOR_SRCS} ${DALI_OPERATOR_OBJ})
 set_target_properties(dali_operators PROPERTIES
     LIBRARY_OUTPUT_DIRECTORY "${DALI_LIBRARY_OUTPUT_DIR}")
-target_link_libraries(dali_operators PUBLIC dali dali_kernels dali_core)
+target_link_libraries(dali_operators PUBLIC dali dali_kernels dali_core dali_imgcodec)
 target_link_libraries(dali_operators PRIVATE dynlink_cuda ${DALI_LIBS})
 if (BUILD_NVML)
   target_link_libraries(dali_operators PRIVATE dynlink_nvml)

dali/operators/imgcodec/CMakeLists.txt

@@ -0,0 +1,17 @@
+# Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+collect_headers(DALI_INST_HDRS PARENT_SCOPE)
+collect_sources(DALI_OPERATOR_SRCS PARENT_SCOPE)
+collect_test_sources(DALI_OPERATOR_TEST_SRCS PARENT_SCOPE)