From 5beea94197565d9a47953af9ff1f217224665155 Mon Sep 17 00:00:00 2001
From: Naoto Kondo <cgigcp3yqt@gmail.com>
Date: Fri, 24 Apr 2020 11:35:46 +0900
Subject: [PATCH] Add AudioFrameV2

---
 src/PyAudioFrame.cpp | 31 +++++++++++++++++++++++++++++++
 src/PyAudioFrame.hpp | 24 ++++++++++++++++++++++++
 src/main.cpp         | 22 ++++++++++++----------
 3 files changed, 67 insertions(+), 10 deletions(-)
 create mode 100644 src/PyAudioFrame.cpp
 create mode 100644 src/PyAudioFrame.hpp

diff --git a/src/PyAudioFrame.cpp b/src/PyAudioFrame.cpp
new file mode 100644
index 0000000..f85e249
--- /dev/null
+++ b/src/PyAudioFrame.cpp
@@ -0,0 +1,31 @@
+#include "PyAudioFrame.hpp"
+
+PyAudioFrameV2::PyAudioFrameV2(int sample_rate_, int no_channels_,
+                               int no_samples_, int64_t timecode_,
+                               float *p_data_, int channel_stride_in_bytes_,
+                               const std::string &metadata_, int64_t timestamp_)
+    : _metadata(metadata_) {
+  sample_rate = sample_rate_;
+  no_channels = no_channels_;
+  no_samples = no_samples_;
+  timecode = timecode_;
+  p_data = p_data_;
+  channel_stride_in_bytes = channel_stride_in_bytes_;
+  p_metadata = _metadata.c_str();
+  timestamp = timestamp_;
+}
+
+PyAudioFrameV2::~PyAudioFrameV2() {}
+
+void PyAudioFrameV2::setData(py::array_t<float> &array) {
+  auto info = array.request();
+  p_data = reinterpret_cast<float *>(info.ptr);
+  channel_stride_in_bytes = info.strides[0];
+}
+
+const std::string &PyAudioFrameV2::getMetadata() const { return _metadata; }
+
+void PyAudioFrameV2::setMetadata(const std::string &data) {
+  _metadata = data;
+  p_metadata = _metadata.c_str();
+}
diff --git a/src/PyAudioFrame.hpp b/src/PyAudioFrame.hpp
new file mode 100644
index 0000000..5ddda02
--- /dev/null
+++ b/src/PyAudioFrame.hpp
@@ -0,0 +1,24 @@
+#include <pybind11/numpy.h>
+#include <pybind11/pybind11.h>
+#include <string>
+
+#include <Processing.NDI.Lib.h>
+
+namespace py = pybind11;
+
+class PyAudioFrameV2 : public NDIlib_audio_frame_v2_t {
+public:
+  PyAudioFrameV2(int sample_rate_, int no_channels_, int no_samples_,
+                 int64_t timecode_, float *p_data_,
+                 int channel_stride_in_bytes_, const std::string &metadata_,
+                 int64_t timestamp_);
+  virtual ~PyAudioFrameV2();
+
+  void setData(py::array_t<float> &array);
+
+  const std::string &getMetadata() const;
+  void setMetadata(const std::string &data);
+
+private:
+  std::string _metadata;
+};
diff --git a/src/main.cpp b/src/main.cpp
index f089885..eb84582 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,7 @@
 #include <pybind11/numpy.h>
 #include <pybind11/pybind11.h>
 
+#include "PyAudioFrame.hpp"
 #include "PyMetadataFrame.hpp"
 #include "PySource.hpp"
 #include "PyVideoFrame.hpp"
@@ -131,23 +132,24 @@ PYBIND11_MODULE(NDIlib, m) {
                     &PyVideoFrameV2::setMetadata)
       .def_readwrite("timestamp", &PyVideoFrameV2::timestamp);
 
-  py::class_<NDIlib_audio_frame_v2_t>(m, "AudioFrameV2")
-      .def(py::init<int, int, int, int64_t, float *, int, const char *,
+  py::class_<PyAudioFrameV2>(m, "AudioFrameV2")
+      .def(py::init<int, int, int, int64_t, float *, int, const std::string &,
                     int64_t>(),
            py::arg("sample_rate") = 48000, py::arg("no_channels") = 2,
            py::arg("no_samples") = 0,
            py::arg("timecode") = NDIlib_send_timecode_synthesize,
-           py::arg("data") = NULL, py::arg("channel_stride_in_bytes") = 0,
+           py::arg("data") = nullptr, py::arg("channel_stride_in_bytes") = 0,
            py::arg("metadata") = nullptr, py::arg("timestamp") = 0)
-      .def_readwrite("sample_rate", &NDIlib_audio_frame_v2_t::sample_rate)
-      .def_readwrite("no_channels", &NDIlib_audio_frame_v2_t::no_channels)
-      .def_readwrite("no_samples", &NDIlib_audio_frame_v2_t::no_samples)
-      .def_readwrite("timecode", &NDIlib_audio_frame_v2_t::timecode)
-      .def_readwrite("data", &NDIlib_audio_frame_v2_t::p_data)
+      .def_readwrite("sample_rate", &PyAudioFrameV2::sample_rate)
+      .def_readwrite("no_channels", &PyAudioFrameV2::no_channels)
+      .def_readwrite("no_samples", &PyAudioFrameV2::no_samples)
+      .def_readwrite("timecode", &PyAudioFrameV2::timecode)
+      .def_property("data", nullptr, &PyAudioFrameV2::setData)
       .def_readwrite("channel_stride_in_bytes",
                      &NDIlib_audio_frame_v2_t::channel_stride_in_bytes)
-      .def_readwrite("metadata", &NDIlib_audio_frame_v2_t::p_metadata)
-      .def_readwrite("timestamp", &NDIlib_audio_frame_v2_t::timestamp);
+      .def_property("metadata", &PyAudioFrameV2::getMetadata,
+                    &PyAudioFrameV2::setMetadata)
+      .def_readwrite("timestamp", &PyAudioFrameV2::timestamp);
 
   py::class_<PyMetadataFrame>(m, "MetadataFrame")
       .def(py::init<int, int64_t, const std::string &>(), py::arg("length") = 0,