can access audio/video buffer using arrays rather than iMemoryBuffer

robin-raymond · robin-raymond · commit 41262cd4c641 · 2019-03-27T11:02:46.000-04:00
diff --git a/windows/wrapper/override/cppwinrt/AudioData.cpp b/windows/wrapper/override/cppwinrt/AudioData.cpp
@@ -30,6 +30,12 @@
 
 using namespace winrt;
 
+
+struct __declspec(uuid("5b0d3235-4dba-4d44-865e-8f1d0e4fd04d")) __declspec(novtable) IMemoryBufferByteAccess : ::IUnknown
+{
+  virtual HRESULT __stdcall GetBuffer(uint8_t** value, uint32_t* capacity) = 0;
+};
+
 struct AudioDataVectorView : implements<
   AudioDataVectorView,
   Windows::Foundation::Collections::IVectorView<int16_t>,
@@ -279,18 +285,34 @@ bool Org::WebRtc::implementation::AudioData::ReadOnly()
 }
 
 //------------------------------------------------------------------------------
-Windows::Foundation::Collections::IVectorView< int16_t > Org::WebRtc::implementation::AudioData::Data()
+Windows::Foundation::IMemoryBuffer Org::WebRtc::implementation::AudioData::Data()
 {
-  if (!native_) { throw hresult_error(E_POINTER); }
+  if (!native_)
+    return {nullptr};
+
+  Windows::Foundation::MemoryBuffer memBuffer{ static_cast<uint32_t>(sizeof(int16_t)*native_->size()) };
 
-  auto data = native_->data();
-  auto size = native_->size();
+  auto ref = memBuffer.CreateReference();
 
-  return winrt::make<AudioDataVectorView>(data, size);
+  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(int16_t)*native_->size()))
+    return {nullptr};
+
+  memcpy(dest, native_->data(), destSize);
+
+  return memBuffer;
 }
 
 //------------------------------------------------------------------------------
-void Org::WebRtc::implementation::AudioData::Data(Windows::Foundation::Collections::IVectorView< int16_t > const & value)
+void Org::WebRtc::implementation::AudioData::Data(Windows::Foundation::IMemoryBuffer const& value)
 {
   if (!native_)
     throw hresult_error(E_POINTER);
@@ -300,30 +322,91 @@ void Org::WebRtc::implementation::AudioData::Data(Windows::Foundation::Collectio
     return;
   }
 
-  auto data = native_->data();
-  if (!data) {
-    native_->wrapper_init_org_webRtc_AudioData(SafeInt<size_t>(value.Size()));
+  auto ref = value.CreateReference();
+
+  auto byteAccess = ref.as<IMemoryBufferByteAccess>();
+  if (!byteAccess) {
+    native_->wrapper_init_org_webRtc_AudioData();
+    return;
+  }
+
+  uint8_t* source{};
+  uint32_t sourceSize{};
+  if (FAILED(byteAccess->GetBuffer(&source, &sourceSize))) {
+    native_->wrapper_init_org_webRtc_AudioData();
+    return;
   }
 
   ZS_ASSERT(!native_->readOnly());
 
   auto bufferSize = native_->size();
-  decltype(bufferSize) passedSize = SafeInt<decltype(bufferSize)>(value.Size());
+  uint64_t passedSize = sourceSize / sizeof(int16_t);;
 
   ZS_ASSERT(passedSize <= bufferSize);
 
   if (passedSize > bufferSize)
     passedSize = bufferSize;
 
   int16_t * const firstData = native_->mutableData();
-  int16_t * const lastData = firstData + passedSize;
 
-  if (!firstData)
-    throw hresult_error(E_UNEXPECTED);
+  memcpy(firstData, source, sizeof(int16_t)*passedSize);
+}
 
-  winrt::array_view<int16_t> view(firstData, lastData);
-  value.GetMany(0, view);
+//------------------------------------------------------------------------------
+uint64_t Org::WebRtc::implementation::AudioData::Length()
+{
+  if (!native_)
+    return {};
+
+  return SafeInt<uint64_t>(native_->size());
 }
 
+//------------------------------------------------------------------------------
+uint64_t Org::WebRtc::implementation::AudioData::GetData(com_array<int16_t>& values)
+{
+  if (!native_)
+    return 0;
+
+  uint64_t inSize = SafeInt<decltype(inSize)>(values.size());
+
+  uint64_t size = native_->size();
+
+  size = inSize < size ? inSize : size;
+
+  auto dest = values.data();
+  auto source = native_->data();
+
+  if ((!dest) ||
+      (!source))
+    return 0;
+
+  memcpy(dest, source, sizeof(int16_t)*size);
+
+  return size;
+}
+
+//------------------------------------------------------------------------------
+uint64_t Org::WebRtc::implementation::AudioData::SetData(array_view<int16_t const> values)
+{
+  if (!native_)
+    return 0;
+
+  uint64_t inSize = SafeInt<decltype(inSize)>(values.size());
+
+  uint64_t size = native_->size();
+
+  size = inSize < size ? inSize : size;
+
+  auto source = values.data();
+  auto dest = native_->mutableData();
+
+  if ((!dest) ||
+     (!source))
+    return 0;
+
+  memcpy(dest, source, sizeof(int16_t)*size);
+
+  return size;
+}
 
 #endif //ifndef CPPWINRT_USE_GENERATED_ORG_WEBRTC_AUDIODATA
diff --git a/windows/wrapper/override/cppwinrt/AudioData.h b/windows/wrapper/override/cppwinrt/AudioData.h
@@ -73,9 +73,12 @@ namespace winrt {
           /// <summary>
           /// Gets or sets the audio samples data. <summary> </summary>
           /// </summary>
-          Windows::Foundation::Collections::IVectorView< int16_t > Data();
-          void Data(Windows::Foundation::Collections::IVectorView< int16_t > const & value);
+          Windows::Foundation::IMemoryBuffer Data();
+          void Data(Windows::Foundation::IMemoryBuffer const& value);
 
+          uint64_t Length();
+          uint64_t GetData(com_array<int16_t>& values);
+          uint64_t SetData(array_view<int16_t const> values);
         };
 
       } // namespace implementation
diff --git a/windows/wrapper/override/cppwinrt/VideoData.cpp b/windows/wrapper/override/cppwinrt/VideoData.cpp
@@ -27,6 +27,8 @@
 #include "RTCRtpTransceiver.h"
 #include "RTCRtpSender.h"
 
+#include <zsLib/SafeInt.h>
+
 using namespace winrt;
 
 struct __declspec(uuid("5b0d3235-4dba-4d44-865e-8f1d0e4fd04d")) __declspec(novtable) IMemoryBufferByteAccess : ::IUnknown
@@ -178,6 +180,62 @@ bool Org::WebRtc::implementation::VideoData::Is16BitColorSpace()
   return ::Internal::Helper::ToCppWinrt_Bool(native_->get_is16BitColorSpace());
 }
 
+//------------------------------------------------------------------------------
+uint64_t Org::WebRtc::implementation::VideoData::Length()
+{
+  if (!native_)
+    return 0;
+
+  return SafeInt<uint64_t>(native_->get_size());
+}
+
+//------------------------------------------------------------------------------
+uint64_t Org::WebRtc::implementation::VideoData::GetData8bit(com_array<uint8_t>& values)
+{
+  if (!native_)
+    return 0;
+
+  uint64_t inSize = SafeInt<decltype(inSize)>(values.size());
+
+  uint64_t size = native_->get_size();
+
+  size = inSize < size ? inSize : size;
+
+  auto dest = values.data();
+  auto source = native_->get_data8bit();
+
+  if ((!dest) ||
+    (!source))
+    return 0;
+
+  memcpy(dest, source, sizeof(uint8_t)*size);
+
+  return size;
+}
+
+//------------------------------------------------------------------------------
+uint64_t Org::WebRtc::implementation::VideoData::GetData16bit(com_array<uint16_t>& values)
+{
+  if (!native_)
+    return 0;
+
+  uint64_t inSize = SafeInt<decltype(inSize)>(values.size());
+  uint64_t size = native_->get_size();
+
+  size = inSize < size ? inSize : size;
+
+  auto dest = values.data();
+  auto source = native_->get_data16bit();
+
+  if ((!dest) ||
+      (!source))
+    return 0;
+
+  memcpy(dest, source, sizeof(uint16_t)*size);
+
+  return size;
+}
+
 //------------------------------------------------------------------------------
 winrt::Windows::Foundation::IMemoryBuffer Org::WebRtc::implementation::VideoData::Data8bit()
 {
diff --git a/windows/wrapper/override/cppwinrt/VideoData.h b/windows/wrapper/override/cppwinrt/VideoData.h
@@ -47,9 +47,6 @@ namespace winrt {
           static wrapper::org::webRtc::VideoDataPtr FromCppWinrt(Org::WebRtc::VideoData const & value);
           static wrapper::org::webRtc::VideoDataPtr FromCppWinrt(Org::WebRtc::IVideoData const & value);
 
-
-
-
         public:
           /// <summary>
           /// Cast from Org::WebRtc::IVideoData to VideoData
@@ -61,6 +58,11 @@ namespace winrt {
 
           bool Is8BitColorSpace();
           bool Is16BitColorSpace();
+
+          uint64_t Length();
+          uint64_t GetData8bit(com_array<uint8_t>& values);
+          uint64_t GetData16bit(com_array<uint16_t>& values);
+
           /// <summary>
           /// Gets or sets the video 8 bit color space data. <summary>
           /// </summary>
@@ -71,7 +73,6 @@ namespace winrt {
           /// </summary>
           /// </summary>
           Windows::Foundation::IMemoryBuffer Data16bit();
-
         };
 
       } // namespace implementation
diff --git a/windows/wrapper/override/msidl/Org.WebRtc.AudioData.idl b/windows/wrapper/override/msidl/Org.WebRtc.AudioData.idl
@@ -19,9 +19,14 @@ namespace Org
             Boolean ReadOnly { get; };
 
             /// <summary>
-            /// Gets or sets the audio samples data.
+            /// Gets or sets the audio samples data (int16s encoded in little endian 2 byte pairs).
             /// </summary>
-            Windows.Foundation.Collections.IVectorView< Int16 > Data { get; set; };
+            Windows.Foundation.IMemoryBuffer Data{ get; set; };
+
+            UInt64 Length{ get; };
+
+            UInt64 GetData(out Int16[] values);
+            UInt64 SetData(Int16[] values);
         };
 
         runtimeclass AudioData : [default] IAudioData, Windows.Foundation.IClosable
diff --git a/windows/wrapper/override/msidl/Org.WebRtc.VideoData.idl b/windows/wrapper/override/msidl/Org.WebRtc.VideoData.idl
@@ -17,6 +17,11 @@ namespace Org
 
             Boolean Is16BitColorSpace { get; };
 
+            UInt64 Length{ get; };
+
+            UInt64 GetData8bit(out UInt8[] values);
+            UInt64 GetData16bit(out UInt16[] values);
+
             /// <summary>
             /// Gets or sets the video 8 bit color space data.
             /// </summary>
