mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-02 22:25:04 -04:00
Started implementation of Video Chat (not working yet!).
- GUI part is done - implemented a very basic JPEG codec - added echo frame in configuration panel - created a video capture object that uses OpenCV (should be cross systems) Remains to do: - serialise and send frames through p3VoRS - use a serious codec (e.g. Theora+x264) - add icons to reflect camera state (failure/working/sending/...) - compilation on windows git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7449 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
3b88acb45d
commit
b6089f3b91
18 changed files with 873 additions and 420 deletions
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include "gui/VoipStatistics.h"
|
||||
#include "gui/AudioInputConfig.h"
|
||||
#include "gui/AudioChatWidgetHolder.h"
|
||||
#include "gui/VOIPChatWidgetHolder.h"
|
||||
#include "gui/PluginGUIHandler.h"
|
||||
#include "gui/PluginNotifier.h"
|
||||
#include "gui/SoundManager.h"
|
||||
|
@ -80,6 +80,9 @@ void VOIPPlugin::setInterfaces(RsPlugInInterfaces &interfaces)
|
|||
|
||||
ConfigPage *VOIPPlugin::qt_config_page() const
|
||||
{
|
||||
// The config pages are deleted when config is closed, so it's important not to static the
|
||||
// created object.
|
||||
//
|
||||
return new AudioInputConfig() ;
|
||||
}
|
||||
|
||||
|
@ -111,7 +114,7 @@ ChatWidgetHolder *VOIPPlugin::qt_get_chat_widget_holder(ChatWidget *chatWidget)
|
|||
{
|
||||
switch (chatWidget->chatType()) {
|
||||
case ChatWidget::CHATTYPE_PRIVATE:
|
||||
return new AudioChatWidgetHolder(chatWidget);
|
||||
return new VOIPChatWidgetHolder(chatWidget);
|
||||
case ChatWidget::CHATTYPE_UNKNOWN:
|
||||
case ChatWidget::CHATTYPE_LOBBY:
|
||||
case ChatWidget::CHATTYPE_DISTANT:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue