Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

accept call

Browse Source
This commit is contained in:
Green Sky 2024-10-01 11:13:27 +02:00
parent a1d3e0a480
commit 9501292fc9
No known key found for this signature in database
4 changed files with 225 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/chat_gui4.cpp
View File

@ -14,6 +14,8 @@
// HACK: remove them // HACK: remove them
#include <solanaceae/tox_contacts/components.hpp> #include <solanaceae/tox_contacts/components.hpp>
#include <entt/entity/entity.hpp>
#include <imgui/imgui.h> #include <imgui/imgui.h>
#include <imgui/misc/cpp/imgui_stdlib.h> #include <imgui/misc/cpp/imgui_stdlib.h>
@ -23,7 +25,6 @@
#include "./media_meta_info_loader.hpp" #include "./media_meta_info_loader.hpp"
#include "./sdl_clipboard_utils.hpp" #include "./sdl_clipboard_utils.hpp"
#include "entt/entity/entity.hpp"
#include <cctype> #include <cctype>
#include <ctime> #include <ctime>
@ -267,7 +268,8 @@ float ChatGui4::render(float time_delta) {
if (ImGui::BeginMenu("VoIP")) { if (ImGui::BeginMenu("VoIP")) {
auto* voip_model = _cr.get<VoIPModelI*>(*_selected_contact); auto* voip_model = _cr.get<VoIPModelI*>(*_selected_contact);
std::vector<Object> contact_sessions; std::vector<ObjectHandle> contact_sessions;
std::vector<ObjectHandle> acceptable_sessions;
for (const auto& [ov, o_vm, sc] : _os.registry().view<VoIPModelI*, Components::VoIP::SessionContact>().each()) { for (const auto& [ov, o_vm, sc] : _os.registry().view<VoIPModelI*, Components::VoIP::SessionContact>().each()) {
if (o_vm != voip_model) { if (o_vm != voip_model) {
continue; continue;
@ -275,7 +277,24 @@ float ChatGui4::render(float time_delta) {
if (sc.c != *_selected_contact) { if (sc.c != *_selected_contact) {
continue; continue;
} }
contact_sessions.push_back(ov);
auto o = _os.objectHandle(ov);
contact_sessions.push_back(o);
if (!o.all_of<Components::VoIP::Incoming>()) {
continue; // not incoming
}
// state is ringing/not yet accepted
const auto* session_state = o.try_get<Components::VoIP::SessionState>();
if (session_state == nullptr) {
continue;
}
if (session_state->state != Components::VoIP::SessionState::State::RINGING) {
continue;
}
acceptable_sessions.push_back(o);
} }
static Components::VoIP::DefaultConfig g_default_connections{}; static Components::VoIP::DefaultConfig g_default_connections{};
@ -289,29 +308,46 @@ float ChatGui4::render(float time_delta) {
ImGui::EndMenu(); ImGui::EndMenu();
} }
// TODO: only list if >1 if (acceptable_sessions.size() < 2) {
if (ImGui::BeginMenu("accept call", false)) { if (ImGui::MenuItem("accept call", nullptr, false, !acceptable_sessions.empty())) {
// list incomming here? voip_model->accept(acceptable_sessions.front(), g_default_connections);
ImGui::EndMenu(); }
} else {
if (ImGui::BeginMenu("accept call", !acceptable_sessions.empty())) {
for (const auto o : acceptable_sessions) {
std::string label = "accept #";
label += std::to_string(entt::to_integral(entt::to_entity(o.entity())));
if (ImGui::MenuItem(label.c_str())) {
voip_model->accept(o, g_default_connections);
}
}
ImGui::EndMenu();
}
} }
// TODO: disable if already in call? // TODO: disable if already in call?
if (ImGui::Button("call")) { if (ImGui::Button(" call ")) {
auto new_session = voip_model->enter(*_selected_contact, g_default_connections); voip_model->enter(*_selected_contact, g_default_connections);
} }
// TODO: only list if >1 if (contact_sessions.size() < 2) {
if (ImGui::BeginMenu("leave/reject call", !contact_sessions.empty())) { if (ImGui::MenuItem("leave/reject call", nullptr, false, !contact_sessions.empty())) {
// list voip_model->leave(contact_sessions.front());
for (const auto ov : contact_sessions) { }
std::string label = "end #"; } else {
label += std::to_string(entt::to_integral(entt::to_entity(ov))); if (ImGui::BeginMenu("leave/reject call")) {
// list
if (ImGui::MenuItem(label.c_str())) { for (const auto o : contact_sessions) {
voip_model->leave({_os.registry(), ov}); std::string label = "end #";
} label += std::to_string(entt::to_integral(entt::to_entity(o.entity())));
if (ImGui::MenuItem(label.c_str())) {
voip_model->leave(o);
}
}
ImGui::EndMenu();
} }
ImGui::EndMenu();
} }
ImGui::EndMenu(); ImGui::EndMenu();

11
src/frame_streams/voip_model.hpp
View File

@ -9,6 +9,11 @@ namespace Components::VoIP {
struct TagVoIPSession {}; struct TagVoIPSession {};
// getting called or invited by
struct Incoming {
Contact3 c{entt::null};
};
struct DefaultConfig { struct DefaultConfig {
bool incoming_audio {true}; bool incoming_audio {true};
bool incoming_video {true}; bool incoming_video {true};
@ -60,13 +65,13 @@ struct VoIPModelI {
// - default stream sources/sinks ? // - default stream sources/sinks ?
// - enable a/v ? -> done on connecting to sources // - enable a/v ? -> done on connecting to sources
// returns object tieing together the VoIP session // returns object tieing together the VoIP session
virtual ObjectHandle enter(const Contact3 c, const Components::VoIP::DefaultConfig& defaults = {true, true, true, true}) { return {}; } virtual ObjectHandle enter(const Contact3 c, const Components::VoIP::DefaultConfig& defaults = {true, true, true, true}) { (void)c,(void)defaults; return {}; }
// accept/join an invite to a session // accept/join an invite to a session
virtual bool accept(ObjectHandle session) { return false; } virtual bool accept(ObjectHandle session, const Components::VoIP::DefaultConfig& defaults = {true, true, true, true}) { (void)session,(void)defaults; return false; }
// leaves a call // leaves a call
// - VoIP session object // - VoIP session object
virtual bool leave(ObjectHandle session) { return false; } virtual bool leave(ObjectHandle session) { (void)session; return false; }
}; };

229
src/tox_av_voip_model.cpp
View File

@ -10,15 +10,12 @@
#include <iostream> #include <iostream>
namespace Contact::Components { namespace Components {
// session instead??? struct ToxAVIncomingAV {
struct ToxAVCall {
bool incoming_audio {false}; bool incoming_audio {false};
bool incoming_video {false}; bool incoming_video {false};
}; };
}
namespace Components {
struct ToxAVAudioSink { struct ToxAVAudioSink {
ObjectHandle o; ObjectHandle o;
// ptr? // ptr?
@ -152,30 +149,56 @@ struct ToxAVCallAudioSink : public FrameStream2SinkI<AudioFrame2> {
} }
}; };
ToxAVVoIPModel::ToxAVVoIPModel(ObjectStore2& os, ToxAVI& av, Contact3Registry& cr, ToxContactModel2& tcm) : void ToxAVVoIPModel::addAudioSource(ObjectHandle session, uint32_t friend_number) {
_os(os), _av(av), _cr(cr), _tcm(tcm) auto& stream_source = session.get_or_emplace<Components::VoIP::StreamSources>().streams;
{
_av.subscribe(this, ToxAV_Event::friend_call);
_av.subscribe(this, ToxAV_Event::friend_call_state);
_av.subscribe(this, ToxAV_Event::friend_audio_bitrate);
_av.subscribe(this, ToxAV_Event::friend_video_bitrate);
_av.subscribe(this, ToxAV_Event::friend_audio_frame);
_av.subscribe(this, ToxAV_Event::friend_video_frame);
// attach to all tox friend contacts ObjectHandle incoming_audio {_os.registry(), _os.registry().create()};
for (const auto& [cv, _] : _cr.view<Contact::Components::ToxFriendPersistent>().each()) { auto new_asrc = std::make_unique<FrameStream2MultiSource<AudioFrame2>>();
_cr.emplace<VoIPModelI*>(cv, this); incoming_audio.emplace<FrameStream2MultiSource<AudioFrame2>*>(new_asrc.get());
incoming_audio.emplace<Components::FrameStream2Source<AudioFrame2>>(std::move(new_asrc));
incoming_audio.emplace<Components::StreamSource>(Components::StreamSource::create<AudioFrame2>("ToxAV Friend Call Incoming Audio"));
std::cout << "new incoming audio\n";
if (
const auto* defaults = session.try_get<Components::VoIP::DefaultConfig>();
defaults != nullptr && defaults->incoming_audio
) {
incoming_audio.emplace<Components::TagConnectToDefault>(); // depends on what was specified in enter()
std::cout << "with default\n";
} }
// TODO: events
stream_source.push_back(incoming_audio);
session.emplace<Components::ToxAVAudioSource>(incoming_audio);
// TODO: tie session to stream
_audio_sources[friend_number] = incoming_audio;
_os.throwEventConstruct(incoming_audio);
} }
ToxAVVoIPModel::~ToxAVVoIPModel(void) { void ToxAVVoIPModel::addAudioSink(ObjectHandle session, uint32_t friend_number) {
for (const auto& [ov, voipmodel] : _os.registry().view<VoIPModelI*>().each()) { auto& stream_sinks = session.get_or_emplace<Components::VoIP::StreamSinks>().streams;
if (voipmodel == this) { ObjectHandle outgoing_audio {_os.registry(), _os.registry().create()};
destroySession(_os.objectHandle(ov));
} auto new_asink = std::make_unique<ToxAVCallAudioSink>(_av, friend_number);
outgoing_audio.emplace<ToxAVCallAudioSink*>(new_asink.get());
outgoing_audio.emplace<AudioStreamReFramer>();
outgoing_audio.emplace<Components::FrameStream2Sink<AudioFrame2>>(std::move(new_asink));
outgoing_audio.emplace<Components::StreamSink>(Components::StreamSink::create<AudioFrame2>("ToxAV Friend Call Outgoing Audio"));
if (
const auto* defaults = session.try_get<Components::VoIP::DefaultConfig>();
defaults != nullptr && defaults->outgoing_audio
) {
outgoing_audio.emplace<Components::TagConnectToDefault>(); // depends on what was specified in enter()
} }
stream_sinks.push_back(outgoing_audio);
session.emplace<Components::ToxAVAudioSink>(outgoing_audio);
// TODO: tie session to stream
_os.throwEventConstruct(outgoing_audio);
} }
void ToxAVVoIPModel::destroySession(ObjectHandle session) { void ToxAVVoIPModel::destroySession(ObjectHandle session) {
@ -220,6 +243,32 @@ void ToxAVVoIPModel::destroySession(ObjectHandle session) {
_os.registry().destroy(session); _os.registry().destroy(session);
} }
ToxAVVoIPModel::ToxAVVoIPModel(ObjectStore2& os, ToxAVI& av, Contact3Registry& cr, ToxContactModel2& tcm) :
_os(os), _av(av), _cr(cr), _tcm(tcm)
{
_av.subscribe(this, ToxAV_Event::friend_call);
_av.subscribe(this, ToxAV_Event::friend_call_state);
_av.subscribe(this, ToxAV_Event::friend_audio_bitrate);
_av.subscribe(this, ToxAV_Event::friend_video_bitrate);
_av.subscribe(this, ToxAV_Event::friend_audio_frame);
_av.subscribe(this, ToxAV_Event::friend_video_frame);
// attach to all tox friend contacts
for (const auto& [cv, _] : _cr.view<Contact::Components::ToxFriendPersistent>().each()) {
_cr.emplace<VoIPModelI*>(cv, this);
}
// TODO: events
}
ToxAVVoIPModel::~ToxAVVoIPModel(void) {
for (const auto& [ov, voipmodel] : _os.registry().view<VoIPModelI*>().each()) {
if (voipmodel == this) {
destroySession(_os.objectHandle(ov));
}
}
}
void ToxAVVoIPModel::tick(void) { void ToxAVVoIPModel::tick(void) {
for (const auto& [oc, asink, asrf] : _os.registry().view<ToxAVCallAudioSink*, AudioStreamReFramer>().each()) { for (const auto& [oc, asink, asrf] : _os.registry().view<ToxAVCallAudioSink*, AudioStreamReFramer>().each()) {
//for (const auto& [oc, asink] : _os.registry().view<ToxAVCallAudioSink*>().each()) { //for (const auto& [oc, asink] : _os.registry().view<ToxAVCallAudioSink*>().each()) {
@ -276,19 +325,79 @@ ObjectHandle ToxAVVoIPModel::enter(const Contact3 c, const Components::VoIP::Def
ObjectHandle new_session {_os.registry(), _os.registry().create()}; ObjectHandle new_session {_os.registry(), _os.registry().create()};
new_session.emplace<Components::VoIP::SessionContact>(c);
new_session.emplace<Components::VoIP::TagVoIPSession>(); // ??
new_session.emplace<Components::VoIP::SessionState>().state = Components::VoIP::SessionState::State::RINGING;
new_session.emplace<VoIPModelI*>(this); new_session.emplace<VoIPModelI*>(this);
new_session.emplace<Components::VoIP::TagVoIPSession>(); // ??
new_session.emplace<Components::VoIP::SessionContact>(c);
new_session.emplace<Components::VoIP::SessionState>().state = Components::VoIP::SessionState::State::RINGING;
new_session.emplace<Components::VoIP::DefaultConfig>(defaults); new_session.emplace<Components::VoIP::DefaultConfig>(defaults);
_os.throwEventConstruct(new_session); _os.throwEventConstruct(new_session);
return new_session; return new_session;
} }
bool ToxAVVoIPModel::accept(ObjectHandle session) { bool ToxAVVoIPModel::accept(ObjectHandle session, const Components::VoIP::DefaultConfig& defaults) {
//_av.toxavAnswer(, 0, 0); if (!static_cast<bool>(session)) {
return false; return false;
}
if (!session.all_of<
Components::VoIP::TagVoIPSession,
VoIPModelI*,
Components::VoIP::SessionContact,
Components::VoIP::Incoming
>()) {
return false;
}
// check if self
if (session.get<VoIPModelI*>() != this) {
return false;
}
const auto session_contact = session.get<Components::VoIP::SessionContact>().c;
if (!_cr.all_of<Contact::Components::ToxFriendEphemeral>(session_contact)) {
return false;
}
const auto friend_number = _cr.get<Contact::Components::ToxFriendEphemeral>(session_contact).friend_number;
auto err = _av.toxavAnswer(friend_number, 0, 0);
if (err != TOXAV_ERR_ANSWER_OK) {
std::cerr << "TOXAVVOIP error: ansering call failed: " << err << "\n";
// we simply let it be for now, it apears we can try ansering later again
// we also get an error here when the call is already in progress (:
return false;
}
session.emplace<Components::VoIP::DefaultConfig>(defaults);
// answer defaults to enabled receiving audio and video
// TODO: think about how we should handle this
// set to disabled? and enable on src connection?
// we already default disabled send and enabled on sink connection
//_av.toxavCallControl(friend_number, TOXAV_CALL_CONTROL_HIDE_VIDEO);
//_av.toxavCallControl(friend_number, TOXAV_CALL_CONTROL_MUTE_AUDIO);
// how do we know the other side is accepting audio
// bitrate cb or what?
assert(!session.all_of<Components::ToxAVAudioSink>());
addAudioSink(session, friend_number);
if (const auto* i_av = session.try_get<Components::ToxAVIncomingAV>(); i_av != nullptr) {
// create audio src
if (i_av->incoming_audio) {
assert(!session.all_of<Components::ToxAVAudioSource>());
addAudioSource(session, friend_number);
}
// create video src
if (i_av->incoming_video) {
}
}
session.get_or_emplace<Components::VoIP::SessionState>().state = Components::VoIP::SessionState::State::CONNECTED;
_os.throwEventUpdate(session);
return true;
} }
bool ToxAVVoIPModel::leave(ObjectHandle session) { bool ToxAVVoIPModel::leave(ObjectHandle session) {
@ -298,7 +407,11 @@ bool ToxAVVoIPModel::leave(ObjectHandle session) {
return false; return false;
} }
if (!session.all_of<Components::VoIP::TagVoIPSession, VoIPModelI*, Components::VoIP::SessionContact>()) { if (!session.all_of<
Components::VoIP::TagVoIPSession,
VoIPModelI*,
Components::VoIP::SessionContact
>()) {
return false; return false;
} }
@ -331,10 +444,12 @@ bool ToxAVVoIPModel::onEvent(const Events::FriendCall& e) {
ObjectHandle new_session {_os.registry(), _os.registry().create()}; ObjectHandle new_session {_os.registry(), _os.registry().create()};
new_session.emplace<Components::VoIP::SessionContact>(session_contact);
new_session.emplace<Components::VoIP::TagVoIPSession>(); // ??
new_session.emplace<Components::VoIP::SessionState>().state = Components::VoIP::SessionState::State::RINGING;
new_session.emplace<VoIPModelI*>(this); new_session.emplace<VoIPModelI*>(this);
new_session.emplace<Components::VoIP::TagVoIPSession>(); // ??
new_session.emplace<Components::VoIP::Incoming>(session_contact); // in 1on1 its always the same contact, might leave blank
new_session.emplace<Components::VoIP::SessionContact>(session_contact);
new_session.emplace<Components::VoIP::SessionState>().state = Components::VoIP::SessionState::State::RINGING;
new_session.emplace<Components::ToxAVIncomingAV>(e.audio_enabled, e.video_enabled);
_os.throwEventConstruct(new_session); _os.throwEventConstruct(new_session);
return true; return true;
@ -368,28 +483,8 @@ bool ToxAVVoIPModel::onEvent(const Events::FriendCallState& e) {
// remote accepted our call, or av send/recv conditions changed? // remote accepted our call, or av send/recv conditions changed?
o.get<Components::VoIP::SessionState>().state = Components::VoIP::SessionState::State::CONNECTED; // set to in call ?? o.get<Components::VoIP::SessionState>().state = Components::VoIP::SessionState::State::CONNECTED; // set to in call ??
auto& stream_sinks = o.get_or_emplace<Components::VoIP::StreamSinks>().streams;
if (s.is_accepting_a() && !o.all_of<Components::ToxAVAudioSink>()) { if (s.is_accepting_a() && !o.all_of<Components::ToxAVAudioSink>()) {
ObjectHandle outgoing_audio {_os.registry(), _os.registry().create()}; addAudioSink(o, e.friend_number);
auto new_asink = std::make_unique<ToxAVCallAudioSink>(_av, e.friend_number);
outgoing_audio.emplace<ToxAVCallAudioSink*>(new_asink.get());
outgoing_audio.emplace<AudioStreamReFramer>();
outgoing_audio.emplace<Components::FrameStream2Sink<AudioFrame2>>(std::move(new_asink));
outgoing_audio.emplace<Components::StreamSink>(Components::StreamSink::create<AudioFrame2>("ToxAV Friend Call Outgoing Audio"));
if (
const auto* defaults = o.try_get<Components::VoIP::DefaultConfig>();
defaults != nullptr && defaults->outgoing_audio
) {
outgoing_audio.emplace<Components::TagConnectToDefault>(); // depends on what was specified in enter()
}
stream_sinks.push_back(outgoing_audio);
o.emplace<Components::ToxAVAudioSink>(outgoing_audio);
// TODO: tie session to stream
_os.throwEventConstruct(outgoing_audio);
} else if (!s.is_accepting_a() && o.all_of<Components::ToxAVAudioSink>()) { } else if (!s.is_accepting_a() && o.all_of<Components::ToxAVAudioSink>()) {
// remove asink? // remove asink?
} }
@ -397,33 +492,9 @@ bool ToxAVVoIPModel::onEvent(const Events::FriendCallState& e) {
// video // video
// add/update sources // add/update sources
auto& stream_source = o.get_or_emplace<Components::VoIP::StreamSources>().streams;
// audio // audio
if (s.is_sending_a() && !o.all_of<Components::ToxAVAudioSource>()) { if (s.is_sending_a() && !o.all_of<Components::ToxAVAudioSource>()) {
ObjectHandle incoming_audio {_os.registry(), _os.registry().create()}; addAudioSource(o, e.friend_number);
auto new_asrc = std::make_unique<FrameStream2MultiSource<AudioFrame2>>();
incoming_audio.emplace<FrameStream2MultiSource<AudioFrame2>*>(new_asrc.get());
incoming_audio.emplace<Components::FrameStream2Source<AudioFrame2>>(std::move(new_asrc));
incoming_audio.emplace<Components::StreamSource>(Components::StreamSource::create<AudioFrame2>("ToxAV Friend Call Incoming Audio"));
std::cout << "new incoming audio\n";
if (
const auto* defaults = o.try_get<Components::VoIP::DefaultConfig>();
defaults != nullptr && defaults->incoming_audio
) {
incoming_audio.emplace<Components::TagConnectToDefault>(); // depends on what was specified in enter()
std::cout << "with default\n";
}
stream_source.push_back(incoming_audio);
o.emplace<Components::ToxAVAudioSource>(incoming_audio);
// TODO: tie session to stream
_audio_sources[e.friend_number] = incoming_audio;
_os.throwEventConstruct(incoming_audio);
} else if (!s.is_sending_a() && o.all_of<Components::ToxAVAudioSource>()) { } else if (!s.is_sending_a() && o.all_of<Components::ToxAVAudioSource>()) {
// remove asrc? // remove asrc?
} }

16
src/tox_av_voip_model.hpp
View File

@ -8,7 +8,7 @@
#include <unordered_map> #include <unordered_map>
struct ToxAVVoIPModel : protected ToxAVEventI, public VoIPModelI { class ToxAVVoIPModel : protected ToxAVEventI, public VoIPModelI {
ObjectStore2& _os; ObjectStore2& _os;
ToxAVI& _av; ToxAVI& _av;
Contact3Registry& _cr; Contact3Registry& _cr;
@ -17,16 +17,22 @@ struct ToxAVVoIPModel : protected ToxAVEventI, public VoIPModelI {
// for faster lookup // for faster lookup
std::unordered_map<uint32_t, ObjectHandle> _audio_sources; std::unordered_map<uint32_t, ObjectHandle> _audio_sources;
ToxAVVoIPModel(ObjectStore2& os, ToxAVI& av, Contact3Registry& cr, ToxContactModel2& tcm); // TODO: virtual? strategy? protected?
~ToxAVVoIPModel(void); virtual void addAudioSource(ObjectHandle session, uint32_t friend_number);
virtual void addAudioSink(ObjectHandle session, uint32_t friend_number);
// TODO: video
void destroySession(ObjectHandle session); void destroySession(ObjectHandle session);
void tick(void); public:
ToxAVVoIPModel(ObjectStore2& os, ToxAVI& av, Contact3Registry& cr, ToxContactModel2& tcm);
~ToxAVVoIPModel(void);
void tick(void);
public: // voip model public: // voip model
ObjectHandle enter(const Contact3 c, const Components::VoIP::DefaultConfig& defaults) override; ObjectHandle enter(const Contact3 c, const Components::VoIP::DefaultConfig& defaults) override;
bool accept(ObjectHandle session) override; bool accept(ObjectHandle session, const Components::VoIP::DefaultConfig& defaults) override;
bool leave(ObjectHandle session) override; bool leave(ObjectHandle session) override;
protected: // toxav events protected: // toxav events