github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-21 14:03:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor Opus Decoding

Browse source
This commit is contained in:
Florian Märkl 2019-09-26 16:15:57 +02:00
commit 6748a94767
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
9 changed files with 240 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gui/include/streamsession.h
View file

@ -19,6 +19,7 @@
#define CHIAKI_STREAMSESSION_H
#include <chiaki/session.h>
#include <chiaki/opusdecoder.h>
#include "videodecoder.h"
#include "exception.h"
@ -65,6 +66,7 @@ class StreamSession : public QObject
private:
SessionLog log;
ChiakiSession session;
ChiakiOpusDecoder opus_decoder;
#if CHIAKI_GUI_ENABLE_QT_GAMEPAD
QGamepad *gamepad;

9
gui/src/streamsession.cpp
View file

@ -64,6 +64,8 @@ StreamSession::StreamSession(const StreamSessionConnectInfo &connect_info, QObje
audio_output(nullptr),
audio_io(nullptr)
{
chiaki_opus_decoder_init(&opus_decoder, log.GetChiakiLog());
QByteArray host_str = connect_info.host.toUtf8();
ChiakiConnectInfo chiaki_connect_info;
@ -84,7 +86,11 @@ StreamSession::StreamSession(const StreamSessionConnectInfo &connect_info, QObje
if(err != CHIAKI_ERR_SUCCESS)
throw ChiakiException("Chiaki Session Init failed: " + QString::fromLocal8Bit(chiaki_error_string(err)));
chiaki_session_set_audio_cb(&session, AudioSettingsCb, AudioFrameCb, this);
chiaki_opus_decoder_set_cb(&opus_decoder, AudioSettingsCb, AudioFrameCb, this);
ChiakiAudioSink audio_sink;
chiaki_opus_decoder_get_sink(&opus_decoder, &audio_sink);
chiaki_session_set_audio_sink(&session, &audio_sink);
chiaki_session_set_video_sample_cb(&session, VideoSampleCb, this);
chiaki_session_set_event_cb(&session, EventCb, this);
@ -102,6 +108,7 @@ StreamSession::~StreamSession()
{
chiaki_session_join(&session);
chiaki_session_fini(&session);
chiaki_opus_decoder_fini(&opus_decoder);
#if CHIAKI_GUI_ENABLE_QT_GAMEPAD
delete gamepad;
#endif