Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-05 07:35:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added bandwidth measurement for video. Still needs codec to accound for it

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-07-20 20:50:36 +00:00
parent 9c3266fdd9
commit c6103b7535
15 changed files with 157 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

35
plugins/VOIP/gui/VOIPChatWidgetHolder.cpp
View file

@ -24,8 +24,6 @@
VOIPChatWidgetHolder::VOIPChatWidgetHolder(ChatWidget *chatWidget)
: QObject(), ChatWidgetHolder(chatWidget)
{
std::cerr << "****** VOIPLugin: Creating new VOIPChatWidgetHolder !!" << std::endl;
QIcon icon ;
icon.addPixmap(QPixmap(":/images/audio-volume-muted-22.png")) ;
icon.addPixmap(QPixmap(":/images/audio-volume-medium-22.png"),QIcon::Normal,QIcon::On) ;
@ -136,7 +134,6 @@ VOIPChatWidgetHolder::~VOIPChatWidgetHolder()
void VOIPChatWidgetHolder::toggleAudioListen()
{
std::cerr << "******** VOIPLugin: Toggling audio listen!" << std::endl;
if (audioListenToggleButton->isChecked()) {
audioListenToggleButton->setToolTip(tr("Mute yourself"));
} else {
@ -150,22 +147,19 @@ void VOIPChatWidgetHolder::toggleAudioListen()
void VOIPChatWidgetHolder::hangupCall()
{
std::cerr << "******** VOIPLugin: Hangup call!" << std::endl;
disconnect(inputAudioProcessor, SIGNAL(networkPacketReady()), this, SLOT(sendAudioData()));
if (inputAudioDevice) {
inputAudioDevice->stop();
}
if (outputAudioDevice) {
outputAudioDevice->stop();
}
audioListenToggleButton->setChecked(false);
audioCaptureToggleButton->setChecked(false);
disconnect(inputAudioProcessor, SIGNAL(networkPacketReady()), this, SLOT(sendAudioData()));
if (inputAudioDevice) {
inputAudioDevice->stop();
}
if (outputAudioDevice) {
outputAudioDevice->stop();
}
audioListenToggleButton->setChecked(false);
audioCaptureToggleButton->setChecked(false);
}
void VOIPChatWidgetHolder::toggleAudioCapture()
{
std::cerr << "******** VOIPLugin: Toggling audio mute capture!" << std::endl;
if (audioCaptureToggleButton->isChecked()) {
//activate audio output
audioListenToggleButton->setChecked(true);
@ -199,8 +193,6 @@ void VOIPChatWidgetHolder::toggleAudioCapture()
}
void VOIPChatWidgetHolder::toggleVideoCapture()
{
std::cerr << "******** VOIPLugin: Toggling video capture!" << std::endl;
if (videoCaptureToggleButton->isChecked())
{
//activate video input
@ -216,6 +208,7 @@ void VOIPChatWidgetHolder::toggleVideoCapture()
{
inputVideoDevice->stop() ;
videoCaptureToggleButton->setToolTip(tr("Activate camera"));
outputVideoDevice->showFrameOff();
}
}
@ -224,6 +217,11 @@ void VOIPChatWidgetHolder::addVideoData(const QString name, QByteArray* array)
outputVideoProcessor->receiveEncodedData((unsigned char *)array->data(),array->size()) ;
}
void VOIPChatWidgetHolder::setAcceptedBandwidth(const QString name, uint32_t bytes_per_sec)
{
inputVideoProcessor->setMaximumFrameRate(bytes_per_sec) ;
}
void VOIPChatWidgetHolder::addAudioData(const QString name, QByteArray* array)
{
if (!audioCaptureToggleButton->isChecked()) {
@ -288,10 +286,7 @@ void VOIPChatWidgetHolder::sendVideoData()
RsVoipDataChunk chunk ;
while(inputVideoDevice && inputVideoDevice->getNextEncodedPacket(chunk))
{
std::cerr << "Video data ready: sending it" << std::endl;
rsVoip->sendVoipData(mChatWidget->getPeerId(),chunk) ;
}
}
void VOIPChatWidgetHolder::sendAudioData()