jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vrplayer: work on removing server side timing

Browse Source
This commit is contained in:
Jay Sorg 2013-11-08 11:20:38 -08:00
parent e8c2f328fb
commit a836aa55cb
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vrplayer/decoderthread.cpp
View File

@ -155,6 +155,7 @@ void DecoderThread::audioTimerCallback()
return; return;
} }
printf("audio2\n");
pkt = audioQueue.dequeue(); pkt = audioQueue.dequeue();
delayInMs = (int) ((float) pkt->delay_in_us / 1000.0); delayInMs = (int) ((float) pkt->delay_in_us / 1000.0);
send_audio_pkt(channel, 101, pkt->av_pkt); send_audio_pkt(channel, 101, pkt->av_pkt);

6
vrplayer/ourinterface.cpp
View File

@ -128,25 +128,27 @@ int OurInterface::sendMetadataFile()
int OurInterface::sendVideoFormat() int OurInterface::sendVideoFormat()
{ {
#if 0
if (xrdpvr_set_video_format(channel, stream_id)) if (xrdpvr_set_video_format(channel, stream_id))
{ {
emit on_ErrorMsg("I/O Error", emit on_ErrorMsg("I/O Error",
"Error sending video format to remote client"); "Error sending video format to remote client");
return -1; return -1;
} }
#endif
return 0; return 0;
} }
int OurInterface::sendAudioFormat() int OurInterface::sendAudioFormat()
{ {
#if 0
if (xrdpvr_set_audio_format(channel, stream_id)) if (xrdpvr_set_audio_format(channel, stream_id))
{ {
emit on_ErrorMsg("I/O Error", emit on_ErrorMsg("I/O Error",
"Error sending audio format to remote client"); "Error sending audio format to remote client");
return -1; return -1;
} }
#endif
return 0; return 0;
} }

2
vrplayer/playaudio.cpp
View File

@ -54,6 +54,7 @@ void PlayAudio::play()
label1: label1:
printf("audio\n");
if (audioQueue->isEmpty()) if (audioQueue->isEmpty())
{ {
qDebug() << "PlayAudio::play: GOT EMPTY"; qDebug() << "PlayAudio::play: GOT EMPTY";
@ -61,6 +62,7 @@ label1:
continue; continue;
} }
printf("")
pkt = audioQueue->dequeue(); pkt = audioQueue->dequeue();
sendMutex->lock(); sendMutex->lock();
send_audio_pkt(channel, stream_id, pkt->av_pkt); send_audio_pkt(channel, stream_id, pkt->av_pkt);