Python 側のエラーを出力する

Author: melpon

src/sora_audio_sink.cpp

@@ -6,6 +6,8 @@
 #include <api/audio/channel_layout.h>
 #include <modules/audio_mixer/audio_frame_manipulator.h>
 
+#include "sora_call.h"
+
 SoraAudioSinkImpl::SoraAudioSinkImpl(SoraTrackInterface* track,
                                      int output_sample_rate,
                                      size_t output_channels)
@@ -111,7 +113,7 @@ void SoraAudioSinkImpl::AppendData(const int16_t* audio_data,
       sample_rate_ = sample_rate;
       number_of_channels_ = number_of_channels;
       if (on_format_) {
-        on_format_(sample_rate_, number_of_channels_);
+        call_python(on_format_, sample_rate_, number_of_channels_);
       }
     }
 
@@ -129,7 +131,7 @@ void SoraAudioSinkImpl::AppendData(const int16_t* audio_data,
     auto data = nb::ndarray<nb::numpy, int16_t, nb::shape<-1, -1>>(
         (void*)audio_data, 2, shape, nb::handle());
     /* まだ使ったことながない。現状 Python 側で on_frame と同じ感覚でコールバックの外に値を持ち出すと落ちるはず。 */
-    on_data_(data);
+    call_python(on_data_, data);
   }
 }
 

src/sora_audio_stream_sink.cpp

@@ -10,6 +10,8 @@
 #include <modules/audio_processing/agc2/rnn_vad/common.h>
 #include <modules/audio_processing/include/audio_frame_view.h>
 
+#include "sora_call.h"
+
 SoraAudioFrameDefaultImpl::SoraAudioFrameDefaultImpl(
     std::unique_ptr<webrtc::AudioFrame> audio_frame)
     : audio_frame_(std::move(audio_frame)) {}
@@ -208,5 +210,6 @@ void SoraAudioStreamSinkImpl::OnData(
     webrtc::RemixFrame(output_channels_, tuned_frame.get());
   }
 
-  on_frame_(std::make_shared<SoraAudioFrame>(std::move(tuned_frame)));
+  call_python(on_frame_,
+              std::make_shared<SoraAudioFrame>(std::move(tuned_frame)));
 }

src/sora_call.h

@@ -0,0 +1,28 @@
+#ifndef SORA_CALL_H_
+#define SORA_CALL_H_
+
+#include <type_traits>
+
+// nanobind
+#include <nanobind/nanobind.h>
+
+// WebRTC
+#include <rtc_base/logging.h>
+
+template <class F, class... Args>
+auto call_python(F f, Args&&... args) -> std::invoke_result_t<F, Args...> {
+  try {
+    return f(args...);
+  } catch (nanobind::python_error& e) {
+    RTC_LOG(LS_ERROR) << "Failed to call python function: " << e.what();
+    throw;
+  } catch (std::exception& e) {
+    RTC_LOG(LS_ERROR) << "Failed to call python function: " << e.what();
+    throw;
+  } catch (...) {
+    RTC_LOG(LS_ERROR) << "Failed to call python function: Unknown exception";
+    throw;
+  }
+}
+
+#endif

src/sora_connection.cpp

@@ -16,6 +16,7 @@
 #include <nanobind/nanobind.h>
 
 #include "gil.h"
+#include "sora_call.h"
 
 namespace nb = nanobind;
 
@@ -180,7 +181,7 @@ void SoraConnection::OnSetOffer(std::string offer) {
     }
   }
   if (on_set_offer_) {
-    on_set_offer_(offer);
+    call_python(on_set_offer_, offer);
   }
 }
 
@@ -189,34 +190,34 @@ void SoraConnection::OnDisconnect(sora::SoraSignalingErrorCode ec,
   gil_scoped_acquire acq;
   ioc_->stop();
   if (on_disconnect_) {
-    on_disconnect_(ec, message);
+    call_python(on_disconnect_, ec, message);
   }
 }
 
 void SoraConnection::OnNotify(std::string text) {
   gil_scoped_acquire acq;
   if (on_notify_) {
-    on_notify_(text);
+    call_python(on_notify_, text);
   }
 }
 
 void SoraConnection::OnPush(std::string text) {
   if (on_push_) {
-    on_push_(text);
+    call_python(on_push_, text);
   }
 }
 
 void SoraConnection::OnMessage(std::string label, std::string data) {
   gil_scoped_acquire acq;
   if (on_message_) {
-    on_message_(label, nb::bytes(data.c_str(), data.size()));
+    call_python(on_message_, label, nb::bytes(data.c_str(), data.size()));
   }
 }
 
 void SoraConnection::OnSwitched(std::string text) {
   gil_scoped_acquire acq;
   if (on_switched_) {
-    on_switched_(text);
+    call_python(on_switched_, text);
   }
 }
 
@@ -225,14 +226,14 @@ void SoraConnection::OnSignalingMessage(sora::SoraSignalingType type,
                                         std::string message) {
   gil_scoped_acquire acq;
   if (on_signaling_message_) {
-    on_signaling_message_(type, direction, message);
+    call_python(on_signaling_message_, type, direction, message);
   }
 }
 
 void SoraConnection::OnWsClose(uint16_t code, std::string message) {
   gil_scoped_acquire acq;
   if (on_ws_close_) {
-    on_ws_close_(code, message);
+    call_python(on_ws_close_, code, message);
   }
 }
 
@@ -244,7 +245,7 @@ void SoraConnection::OnTrack(
     // shared_ptr になってないとリークする
     auto track = std::make_shared<SoraMediaTrack>(this, receiver);
     AddSubscriber(track.get());
-    on_track_(track);
+    call_python(on_track_, track);
   }
 }
 
@@ -257,6 +258,6 @@ void SoraConnection::OnRemoveTrack(
 void SoraConnection::OnDataChannel(std::string label) {
   gil_scoped_acquire acq;
   if (on_data_channel_) {
-    on_data_channel_(label);
+    call_python(on_data_channel_, label);
   }
 }

src/sora_video_sink.cpp

@@ -7,6 +7,7 @@
 #include <third_party/libyuv/include/libyuv.h>
 
 #include "gil.h"
+#include "sora_call.h"
 
 SoraVideoFrame::SoraVideoFrame(
     rtc::scoped_refptr<webrtc::I420BufferInterface> i420_data)
@@ -108,7 +109,7 @@ void SoraVideoSinkImpl::OnFrame(const webrtc::VideoFrame& frame) {
        */
       rtc::scoped_refptr<webrtc::I420BufferInterface> i420_data =
           frame.video_frame_buffer()->ToI420();
-      on_frame_(std::make_shared<SoraVideoFrame>(i420_data));
+      call_python(on_frame_, std::make_shared<SoraVideoFrame>(i420_data));
     }
   });
 }