diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2013-11-08 11:20:38 -0800 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2013-11-08 11:20:38 -0800 |
| commit | a836aa55cb73c71b839ab5034e81480f6fe5bd70 (patch) | |
| tree | 68a5dd772830a836fc317125f809445f30203b3d | |
| parent | e8c2f328fb1c5ef118c045e8275878b81349988d (diff) | |
| download | xrdp-proprietary-a836aa55cb73c71b839ab5034e81480f6fe5bd70.tar.gz xrdp-proprietary-a836aa55cb73c71b839ab5034e81480f6fe5bd70.zip | |
vrplayer: work on removing server side timing
| -rw-r--r-- | vrplayer/decoderthread.cpp | 1 | ||||
| -rw-r--r-- | vrplayer/ourinterface.cpp | 6 | ||||
| -rw-r--r-- | vrplayer/playaudio.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/vrplayer/decoderthread.cpp b/vrplayer/decoderthread.cpp index e31b1aa3..dc958f86 100644 --- a/vrplayer/decoderthread.cpp +++ b/vrplayer/decoderthread.cpp @@ -155,6 +155,7 @@ void DecoderThread::audioTimerCallback() return; } + printf("audio2\n"); pkt = audioQueue.dequeue(); delayInMs = (int) ((float) pkt->delay_in_us / 1000.0); send_audio_pkt(channel, 101, pkt->av_pkt); diff --git a/vrplayer/ourinterface.cpp b/vrplayer/ourinterface.cpp index cee66691..87f7000e 100644 --- a/vrplayer/ourinterface.cpp +++ b/vrplayer/ourinterface.cpp @@ -128,25 +128,27 @@ int OurInterface::sendMetadataFile() int OurInterface::sendVideoFormat() { +#if 0 if (xrdpvr_set_video_format(channel, stream_id)) { emit on_ErrorMsg("I/O Error", "Error sending video format to remote client"); return -1; } - +#endif return 0; } int OurInterface::sendAudioFormat() { +#if 0 if (xrdpvr_set_audio_format(channel, stream_id)) { emit on_ErrorMsg("I/O Error", "Error sending audio format to remote client"); return -1; } - +#endif return 0; } diff --git a/vrplayer/playaudio.cpp b/vrplayer/playaudio.cpp index fee98f9d..e6ff2e27 100644 --- a/vrplayer/playaudio.cpp +++ b/vrplayer/playaudio.cpp @@ -54,6 +54,7 @@ void PlayAudio::play() label1: + printf("audio\n"); if (audioQueue->isEmpty()) { qDebug() << "PlayAudio::play: GOT EMPTY"; @@ -61,6 +62,7 @@ label1: continue; } + printf("") pkt = audioQueue->dequeue(); sendMutex->lock(); send_audio_pkt(channel, stream_id, pkt->av_pkt); |
