opencv
diff --git a/‎modules/gapi/CMakeLists.txt
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎modules/gapi/CMakeLists.txt
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎modules/gapi/include/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp
Copy file name to clipboard
+44-13Lines changed: 44 additions & 13 deletions b/‎modules/gapi/include/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp
Copy file name to clipboard
+44-13Lines changed: 44 additions & 13 deletions
diff --git a/‎modules/gapi/src/streaming/onevpl/cfg_param_device_selector.cpp
Copy file name to clipboard
+1-39Lines changed: 1 addition & 39 deletions b/‎modules/gapi/src/streaming/onevpl/cfg_param_device_selector.cpp
Copy file name to clipboard
+1-39Lines changed: 1 addition & 39 deletions
diff --git a/‎modules/gapi/src/streaming/onevpl/data_provider_defines.hpp
Copy file name to clipboard
+32Lines changed: 32 additions & 0 deletions b/‎modules/gapi/src/streaming/onevpl/data_provider_defines.hpp
Copy file name to clipboard
+32Lines changed: 32 additions & 0 deletions
diff --git a/‎modules/gapi/src/streaming/onevpl/data_provider_dispatcher.cpp
Copy file name to clipboard
+68Lines changed: 68 additions & 0 deletions b/‎modules/gapi/src/streaming/onevpl/data_provider_dispatcher.cpp
Copy file name to clipboard
+68Lines changed: 68 additions & 0 deletions
diff --git a/‎modules/gapi/src/streaming/onevpl/data_provider_dispatcher.hpp
Copy file name to clipboard
+29Lines changed: 29 additions & 0 deletions b/‎modules/gapi/src/streaming/onevpl/data_provider_dispatcher.hpp
Copy file name to clipboard
+29Lines changed: 29 additions & 0 deletions
diff --git a/‎modules/gapi/src/streaming/onevpl/data_provider_interface_exception.cpp
Copy file name to clipboard
+32-5Lines changed: 32 additions & 5 deletions b/‎modules/gapi/src/streaming/onevpl/data_provider_interface_exception.cpp
Copy file name to clipboard
+32-5Lines changed: 32 additions & 5 deletions
@@ -180,6 +180,8 @@ set(gapi_srcs
     src/streaming/onevpl/engine/processing_engine_base.cpp
     src/streaming/onevpl/engine/decode/decode_engine_legacy.cpp
     src/streaming/onevpl/engine/decode/decode_session.cpp
+    src/streaming/onevpl/demux/async_mfp_demux_data_provider.cpp
+    src/streaming/onevpl/data_provider_dispatcher.cpp
 
     src/streaming/onevpl/cfg_param_device_selector.cpp
     src/streaming/onevpl/device_selector_interface.cpp
 
@@ -7,28 +7,39 @@
 #ifndef GAPI_STREAMING_ONEVPL_ONEVPL_DATA_PROVIDER_INTERFACE_HPP
 #define GAPI_STREAMING_ONEVPL_ONEVPL_DATA_PROVIDER_INTERFACE_HPP
 #include <exception>
+#include <memory>
 #include <string>
 
 #include <opencv2/gapi/own/exports.hpp> // GAPI_EXPORTS
-
 namespace cv {
 namespace gapi {
 namespace wip {
 namespace onevpl {
 
 struct GAPI_EXPORTS DataProviderException : public std::exception {
-    virtual ~DataProviderException() {}
-};
+    DataProviderException(const std::string& descr);
+    DataProviderException(std::string&& descr);
 
-struct GAPI_EXPORTS DataProviderSystemErrorException : public DataProviderException {
-    DataProviderSystemErrorException(int error_code, const std::string& desription = std::string());
-    virtual ~DataProviderSystemErrorException();
+    virtual ~DataProviderException() = default;
     virtual const char* what() const noexcept override;
-
 private:
     std::string reason;
 };
 
+struct GAPI_EXPORTS DataProviderSystemErrorException final : public DataProviderException {
+    DataProviderSystemErrorException(int error_code, const std::string& desription = std::string());
+    ~DataProviderSystemErrorException() = default;
+};
+
+struct GAPI_EXPORTS DataProviderUnsupportedException final : public DataProviderException {
+    DataProviderUnsupportedException(const std::string& description);
+    ~DataProviderUnsupportedException() = default;
+};
+
+struct GAPI_EXPORTS DataProviderImplementationException : public DataProviderException {
+    DataProviderImplementationException(const std::string& description);
+    ~DataProviderImplementationException() = default;
+};
 /**
  * @brief Public interface allows to customize extraction of video stream data
  * used by onevpl::GSource instead of reading stream from file (by default).
@@ -41,21 +52,41 @@ struct GAPI_EXPORTS DataProviderSystemErrorException : public DataProviderExcept
  */
 struct GAPI_EXPORTS IDataProvider {
     using Ptr = std::shared_ptr<IDataProvider>;
+    using mfx_codec_id_type = uint32_t;
+
+    /**
+     * NB: here is supposed to be forward declaration of mfxBitstream
+     * But according to current oneVPL implementation it is impossible to forward
+     * declare untagged struct mfxBitstream.
+     *
+     * IDataProvider makes sense only for HAVE_VPL is ON and to keep IDataProvider
+     * interface API/ABI compliant between core library and user application layer
+     * let's introduce wrapper mfx_bitstream which inherits mfxBitstream in private
+     * G-API code section and declare forward for wrapper mfx_bitstream here
+     */
+    struct mfx_bitstream;
 
-    virtual ~IDataProvider() {}
+    virtual ~IDataProvider() = default;
+
+    /**
+     * The function is used by onevpl::GSource to extract codec id from data
+     *
+     */
+    virtual mfx_codec_id_type get_mfx_codec_id() const = 0;
 
     /**
      * The function is used by onevpl::GSource to extract binary data stream from @ref IDataProvider
      * implementation.
      *
      * It MUST throw `DataProviderException` kind exceptions in fail cases.
-     * It MUST return 0 in EOF which considered as not-fail case.
+     * It MUST return MFX_ERR_MORE_DATA in EOF which considered as not-fail case.
      *
-     * @param out_data_bytes_size the available capacity of out_data buffer.
-     * @param out_data the output consumer buffer with capacity out_data_bytes_size.
-     * @return fetched bytes count.
+     * @param in_out_bitsream the input-output reference on MFX bitstream buffer which MUST be empty at the first request
+     * to allow implementation to allocate it by itself and to return back. Subsequent invocation of `fetch_bitstream_data`
+     * MUST use the previously used in_out_bitsream to avoid skipping rest of frames which haven't been consumed
+     * @return true for fetched data, false on EOF and throws exception on error
      */
-    virtual size_t fetch_data(size_t out_data_bytes_size, void* out_data) = 0;
+    virtual bool fetch_bitstream_data(std::shared_ptr<mfx_bitstream> &in_out_bitsream) = 0;
 
     /**
      * The function is used by onevpl::GSource to check more binary data availability.
 
@@ -10,6 +10,7 @@
 #include <opencv2/gapi/util/variant.hpp>
 
 #include "streaming/onevpl/cfg_param_device_selector.hpp"
+#include "streaming/onevpl/cfg_params_parser.hpp"
 #include "streaming/onevpl/utils.hpp"
 #include "logger.hpp"
 
@@ -37,45 +38,6 @@ namespace gapi {
 namespace wip {
 namespace onevpl {
 
-// TODO Will be changed on generic function from `onevpl_param_parser` as soons as feature merges
-static mfxVariant cfg_param_to_mfx_variant(const CfgParam& accel_param) {
-    mfxVariant ret;
-    const CfgParam::value_t& accel_val = accel_param.get_value();
-    if (!cv::util::holds_alternative<std::string>(accel_val)) {
-        // expected string or uint32_t as value
-        if (!cv::util::holds_alternative<uint32_t>(accel_val)) {
-            throw std::logic_error("Incorrect value type of \"mfxImplDescription.AccelerationMode\" "
-                                   " std::string is expected" );
-        }
-        ret.Type = MFX_VARIANT_TYPE_U32;
-        ret.Data.U32 = cv::util::get<uint32_t>(accel_val);
-        return ret;
-    }
-
-    const std::string& accel_val_str = cv::util::get<std::string>(accel_val);
-    ret.Type = MFX_VARIANT_TYPE_U32;
-    if (accel_val_str == "MFX_ACCEL_MODE_NA") {
-        ret.Data.U32 = MFX_ACCEL_MODE_NA;
-    } else if (accel_val_str == "MFX_ACCEL_MODE_VIA_D3D9") {
-        ret.Data.U32 = MFX_ACCEL_MODE_VIA_D3D9;
-    } else if (accel_val_str == "MFX_ACCEL_MODE_VIA_D3D11") {
-        ret.Data.U32 = MFX_ACCEL_MODE_VIA_D3D11;
-    } else if (accel_val_str == "MFX_ACCEL_MODE_VIA_VAAPI") {
-        ret.Data.U32 = MFX_ACCEL_MODE_VIA_VAAPI;
-    } else if (accel_val_str == "MFX_ACCEL_MODE_VIA_VAAPI_DRM_MODESET") {
-        ret.Data.U32 = MFX_ACCEL_MODE_VIA_VAAPI_DRM_MODESET;
-    } else if (accel_val_str == "MFX_ACCEL_MODE_VIA_VAAPI_GLX") {
-        ret.Data.U32 = MFX_ACCEL_MODE_VIA_VAAPI_GLX;
-    } else if (accel_val_str == "MFX_ACCEL_MODE_VIA_VAAPI_X11") {
-        ret.Data.U32 = MFX_ACCEL_MODE_VIA_VAAPI_X11;
-    } else if (accel_val_str == "MFX_ACCEL_MODE_VIA_VAAPI_WAYLAND") {
-        ret.Data.U32 = MFX_ACCEL_MODE_VIA_VAAPI_WAYLAND;
-    } else if (accel_val_str == "MFX_ACCEL_MODE_VIA_HDDLUNITE") {
-        ret.Data.U32 = MFX_ACCEL_MODE_VIA_HDDLUNITE;
-    }
-    return ret;
-}
-
 CfgParamDeviceSelector::CfgParamDeviceSelector(const CfgParams& cfg_params) :
     suggested_device(IDeviceSelector::create<Device>(nullptr, "CPU", AccelType::HOST)),
     suggested_context(IDeviceSelector::create<Context>(nullptr, AccelType::HOST)) {
 
@@ -0,0 +1,32 @@
+#ifndef GAPI_STREAMING_ONEVPL_DATA_PROVIDER_DEFINES_HPP
+#define GAPI_STREAMING_ONEVPL_DATA_PROVIDER_DEFINES_HPP
+
+#ifdef HAVE_ONEVPL
+#include <vpl/mfxcommon.h>
+#include <vpl/mfxvideo.h>
+#endif // HAVE_ONEVPL
+
+#include <opencv2/gapi/own/assert.hpp>
+#include <opencv2/gapi/streaming/onevpl/data_provider_interface.hpp>
+
+namespace cv {
+namespace gapi {
+namespace wip {
+namespace onevpl {
+
+#ifdef HAVE_ONEVPL
+struct IDataProvider::mfx_bitstream : public mfxBitstream {};
+#else // HAVE_ONEVPL
+struct IDataProvider::mfx_bitstream {
+    mfx_bitstream() {
+        GAPI_Assert(false && "Reject to create `mfxBitstream` because library compiled without VPL/MFX support");
+    }
+};
+#endif // HAVE_ONEVPL
+
+} // namespace onevpl
+} // namespace wip
+} // namespace gapi
+} // namespace cv
+
+#endif // GAPI_STREAMING_ONEVPL_DATA_PROVIDER_DEFINES_HPP
@@ -0,0 +1,68 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at https://opencv.org/license.html.
+//
+// Copyright (C) 2021 Intel Corporation
+
+#ifdef HAVE_ONEVPL
+
+#include "streaming/onevpl/data_provider_dispatcher.hpp"
+#include "streaming/onevpl/file_data_provider.hpp"
+#include "streaming/onevpl/demux/async_mfp_demux_data_provider.hpp"
+#include "logger.hpp"
+
+namespace cv {
+namespace gapi {
+namespace wip {
+namespace onevpl {
+
+IDataProvider::Ptr DataProviderDispatcher::create(const std::string& file_path,
+                                                  const std::vector<CfgParam> &cfg_params) {
+    GAPI_LOG_INFO(nullptr, "try select suitable IDataProvider for source: " <<
+                           file_path);
+
+    IDataProvider::Ptr provider;
+
+    // Look-up CodecId from input params
+    // If set then raw data provider is preferred
+    GAPI_LOG_DEBUG(nullptr, "try find explicit cfg param\"mfxImplDescription.mfxDecoderDescription.decoder.CodecID\"");
+    auto codec_it =
+        std::find_if(cfg_params.begin(), cfg_params.end(), [] (const CfgParam& value) {
+            return value.get_name() == "mfxImplDescription.mfxDecoderDescription.decoder.CodecID";
+        });
+    if (codec_it != cfg_params.end()) {
+        GAPI_LOG_DEBUG(nullptr, "Dispatcher found \"mfxImplDescription.mfxDecoderDescription.decoder.CodecID\""
+                                " so try on raw data provider at first");
+
+        try {
+            provider = std::make_shared<FileDataProvider>(file_path, cfg_params);
+            GAPI_LOG_INFO(nullptr, "raw data provider created");
+        } catch (const DataProviderUnsupportedException& ex) {
+            GAPI_LOG_INFO(nullptr, "raw data provider creation is failed, reason: " <<
+                                    ex.what());
+        }
+    }
+
+    if (!provider) {
+        GAPI_LOG_DEBUG(nullptr, "Try on MFP data provider");
+        try {
+            provider = std::make_shared<MFPAsyncDemuxDataProvider>(file_path);
+            GAPI_LOG_INFO(nullptr, "MFP data provider created");
+        } catch (const DataProviderUnsupportedException& ex) {
+            GAPI_LOG_INFO(nullptr, "MFP data provider creation is failed, reason: " <<
+                                   ex.what());
+        }
+    }
+
+    // final check
+    if (!provider) {
+        GAPI_LOG_WARNING(nullptr, "Cannot find suitable data provider");
+        throw DataProviderUnsupportedException("Unsupported source or configuration parameters");;
+    }
+    return provider;
+}
+} // namespace onevpl
+} // namespace wip
+} // namespace gapi
+} // namespace cv
+#endif // HAVE_ONEVPL
@@ -0,0 +1,29 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at https://opencv.org/license.html.
+//
+// Copyright (C) 2021 Intel Corporation
+
+#ifndef GAPI_STREAMING_ONEVPL_DATA_PROVIDER_DISPATCHER_HPP
+#define GAPI_STREAMING_ONEVPL_DATA_PROVIDER_DISPATCHER_HPP
+
+#ifdef HAVE_ONEVPL
+#include <opencv2/gapi/streaming/onevpl/data_provider_interface.hpp>
+#include <opencv2/gapi/streaming/onevpl/cfg_params.hpp>
+
+namespace cv {
+namespace gapi {
+namespace wip {
+namespace onevpl {
+
+struct GAPI_EXPORTS DataProviderDispatcher {
+
+    static IDataProvider::Ptr create(const std::string& file_path,
+                                     const std::vector<CfgParam> &codec_params = {});
+};
+} // namespace onevpl
+} // namespace wip
+} // namespace gapi
+} // namespace cv
+#endif // HAVE_ONEVPL
+#endif // GAPI_STREAMING_ONEVPL_DATA_PROVIDER_DISPATCHER_HPP
@@ -1,3 +1,14 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at https://opencv.org/license.html.
+//
+// Copyright (C) 2021 Intel Corporation
+
+#ifdef HAVE_ONEVPL
+#include <vpl/mfxvideo.h>
+#include <vpl/mfxjpeg.h>
+#endif // HAVE_ONEVPL
+
 #include <errno.h>
 #include <string.h>
 
@@ -7,15 +18,31 @@ namespace cv {
 namespace gapi {
 namespace wip {
 namespace onevpl {
-DataProviderSystemErrorException::DataProviderSystemErrorException(int error_code, const std::string& desription) {
-    reason = desription + ", error: " + std::to_string(error_code) + ", desctiption: " + strerror(error_code);
-}
 
-DataProviderSystemErrorException::~DataProviderSystemErrorException() = default;
+DataProviderException::DataProviderException(const std::string& descr) :
+    reason(descr) {
+}
+DataProviderException::DataProviderException(std::string&& descr) :
+    reason(std::move(descr)) {
+}
 
-const char* DataProviderSystemErrorException::what() const noexcept {
+const char* DataProviderException::what() const noexcept {
     return reason.c_str();
 }
+
+DataProviderSystemErrorException::DataProviderSystemErrorException(int error_code,
+                                                                   const std::string& description) :
+    DataProviderException(description + ", error code: " + std::to_string(error_code) + " - " + strerror(error_code)) {
+
+}
+
+DataProviderUnsupportedException::DataProviderUnsupportedException(const std::string& description) :
+    DataProviderException(description) {
+}
+
+DataProviderImplementationException::DataProviderImplementationException(const std::string& description) :
+    DataProviderException(description) {
+}
 } // namespace onevpl
 } // namespace wip
 } // namespace gapi