VideoData now returns a MemoryBuffer instead of a vector view

Author: robin-raymond

windows/wrapper/override/cppwinrt/VideoData.cpp

@@ -29,60 +29,11 @@
 
 using namespace winrt;
 
-template <typename TValueType>
-struct VideoDataVectorView : implements<
-  VideoDataVectorView<TValueType>,
-  Windows::Foundation::Collections::IVectorView<TValueType>,
-  Windows::Foundation::Collections::IIterable<TValueType>>,
-  winrt::vector_view_base<VideoDataVectorView<TValueType>, TValueType>
-{
-  VideoDataVectorView(
-    const TValueType * const data,
-    size_t size
-  ) : container_(data, size)
-  {}
-
-  auto& get_container() const noexcept
-  {
-    return container_;
-  }
-
-  auto& get_container() noexcept
-  {
-    return container_;
-  }
-
-private:
-
-  struct Container
-  {
-    Container(
-      const TValueType * const data,
-      size_t size) :
-      first_(data),
-      last_(data + size)
-    {}
-
-    TValueType const* const first_;
-    TValueType const* const last_;
-
-    auto begin() const noexcept
-    {
-      return first_;
-    }
-
-    auto end() const noexcept
-    {
-      return last_;
-    }
-  };
-
-  Container container_;
+struct __declspec(uuid("5b0d3235-4dba-4d44-865e-8f1d0e4fd04d")) __declspec(novtable) IMemoryBufferByteAccess : ::IUnknown
+{
+  virtual HRESULT __stdcall GetBuffer(uint8_t** value, uint32_t* capacity) = 0;
 };
 
-typedef VideoDataVectorView<uint8_t> VideoData8BitVectorView;
-typedef VideoDataVectorView<uint16_t> VideoData16BitVectorView;
-
 //------------------------------------------------------------------------------
 winrt::com_ptr< Org::WebRtc::implementation::VideoData > Org::WebRtc::implementation::VideoData::ToCppWinrtImpl(wrapper::org::webRtc::VideoDataPtr value)
 {
@@ -228,26 +179,57 @@ bool Org::WebRtc::implementation::VideoData::Is16BitColorSpace()
 }
 
 //------------------------------------------------------------------------------
-Windows::Foundation::Collections::IVectorView< uint8_t > Org::WebRtc::implementation::VideoData::Data8bit()
+winrt::Windows::Foundation::IMemoryBuffer Org::WebRtc::implementation::VideoData::Data8bit()
 {
-  if (!native_) { throw hresult_error(E_POINTER); }
+  if (!native_)
+    return {nullptr};
+
+  Windows::Foundation::MemoryBuffer memBuffer{ static_cast<uint32_t>(sizeof(uint8_t)*native_->get_size()) };
+
+  auto ref = memBuffer.CreateReference();
+
+  auto byteAccess = ref.as<IMemoryBufferByteAccess>();
+  if (!byteAccess)
+    return {nullptr};
+
+  uint8_t* dest{};
+  uint32_t destSize {};
+  if (FAILED(byteAccess->GetBuffer(&dest, &destSize)))
+    return {nullptr};
+
+  if (destSize != (sizeof(uint8_t)*native_->get_size()))
+    return {nullptr};
 
-  auto data = native_->get_data8bit();
-  auto size = native_->get_size();
+  memcpy(dest, native_->get_data8bit(), destSize);
 
-  return winrt::make<VideoData8BitVectorView>(data, size);
+  return memBuffer;
 }
 
 //------------------------------------------------------------------------------
-Windows::Foundation::Collections::IVectorView< uint16_t > Org::WebRtc::implementation::VideoData::Data16bit()
+winrt::Windows::Foundation::IMemoryBuffer Org::WebRtc::implementation::VideoData::Data16bit()
 {
-  if (!native_) { throw hresult_error(E_POINTER); }
+  if (!native_)
+    return {nullptr};
 
-  auto data = native_->get_data16bit();
-  auto size = native_->get_size();
+  Windows::Foundation::MemoryBuffer memBuffer{ static_cast<uint32_t>(sizeof(uint16_t)*native_->get_size()) };
 
-  return winrt::make<VideoData16BitVectorView>(data, size);
-}
+  auto ref = memBuffer.CreateReference();
+
+  auto byteAccess = ref.as<IMemoryBufferByteAccess>();
+  if (!byteAccess)
+    return {nullptr};
+
+  uint8_t* dest{};
+  uint32_t destSize {};
+  if (FAILED(byteAccess->GetBuffer(&dest, &destSize)))
+    return {nullptr};
 
+  if (destSize != (sizeof(uint16_t)*native_->get_size()))
+    return {nullptr};
+
+  memcpy(dest, native_->get_data16bit(), destSize);
+
+  return memBuffer;
+}
 
 #endif //ifndef CPPWINRT_USE_GENERATED_ORG_WEBRTC_VIDEODATA

windows/wrapper/override/cppwinrt/VideoData.h

@@ -65,12 +65,12 @@ namespace winrt {
           /// Gets or sets the video 8 bit color space data. <summary>
           /// </summary>
           /// </summary>
-          Windows::Foundation::Collections::IVectorView< uint8_t > Data8bit();
+          Windows::Foundation::IMemoryBuffer Data8bit();
           /// <summary>
           /// Gets or sets the video 16 bit color space data. <summary>
           /// </summary>
           /// </summary>
-          Windows::Foundation::Collections::IVectorView< uint16_t > Data16bit();
+          Windows::Foundation::IMemoryBuffer Data16bit();
 
         };
 

windows/wrapper/override/msidl/Org.WebRtc.VideoData.idl

@@ -18,16 +18,14 @@ namespace Org
             Boolean Is16BitColorSpace { get; };
 
             /// <summary>
-            /// Gets or sets the video 8 bit color space data. <summary>
+            /// Gets or sets the video 8 bit color space data.
             /// </summary>
-            /// </summary>
-            Windows.Foundation.Collections.IVectorView< UInt8 > Data8bit { get; };
+            Windows.Foundation.IMemoryBuffer Data8bit { get; };
 
             /// <summary>
-            /// Gets or sets the video 16 bit color space data. <summary>
-            /// </summary>
+            /// Gets or sets the video 16 bit color space data (as 8 bit / 2 byte little endian).
             /// </summary>
-            Windows.Foundation.Collections.IVectorView< UInt16 > Data16bit { get; };
+            Windows.Foundation.IMemoryBuffer Data16bit { get; };
         };
 
         runtimeclass VideoData : [default] IVideoData