Diffstat (limited to 'core/multimedia/opieplayer/loopcontrol.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/loopcontrol.cpp | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp index dd466ed..90a7cc6 100644 --- a/core/multimedia/opieplayer/loopcontrol.cpp +++ b/core/multimedia/opieplayer/loopcontrol.cpp | |||
@@ -1,7 +1,7 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of the Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
@@ -17,12 +17,14 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // L.J.Potter added changes Fri 02-15-2002 | ||
21 | |||
22 | |||
20 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
21 | #ifdef Q_WS_QWS | ||
22 | 24 | ||
25 | #ifdef Q_WS_QWS | ||
23 | #include <qpe/qcopenvelope_qws.h> | 26 | #include <qpe/qcopenvelope_qws.h> |
24 | #endif | 27 | #endif |
25 | #include <qpe/mediaplayerplugininterface.h> | ||
26 | #include <stdio.h> | 28 | #include <stdio.h> |
27 | #include <stdlib.h> | 29 | #include <stdlib.h> |
28 | #include <string.h> | 30 | #include <string.h> |
@@ -32,6 +34,7 @@ | |||
32 | #include "loopcontrol.h" | 34 | #include "loopcontrol.h" |
33 | #include "videowidget.h" | 35 | #include "videowidget.h" |
34 | #include "audiodevice.h" | 36 | #include "audiodevice.h" |
37 | #include "mediaplayerplugininterface.h" | ||
35 | #include "mediaplayerstate.h" | 38 | #include "mediaplayerstate.h" |
36 | 39 | ||
37 | 40 | ||
@@ -102,10 +105,8 @@ LoopControl::LoopControl( QObject *parent, const char *name ) | |||
102 | audioMutex = new Mutex; | 105 | audioMutex = new Mutex; |
103 | 106 | ||
104 | pthread_attr_init(&audio_attr); | 107 | pthread_attr_init(&audio_attr); |
105 | 108 | #define USE_REALTIME_AUDIO_THREAD | |
106 | if ( getuid() == 0 ) { | 109 | #ifdef USE_REALTIME_AUDIO_THREAD |
107 | printf("true, guid = %i\n", getuid()); | ||
108 | |||
109 | // Attempt to set it to real-time round robin | 110 | // Attempt to set it to real-time round robin |
110 | if ( pthread_attr_setschedpolicy( &audio_attr, SCHED_RR ) == 0 ) { | 111 | if ( pthread_attr_setschedpolicy( &audio_attr, SCHED_RR ) == 0 ) { |
111 | sched_param params; | 112 | sched_param params; |
@@ -116,10 +117,7 @@ LoopControl::LoopControl( QObject *parent, const char *name ) | |||
116 | pthread_attr_destroy(&audio_attr); | 117 | pthread_attr_destroy(&audio_attr); |
117 | pthread_attr_init(&audio_attr); | 118 | pthread_attr_init(&audio_attr); |
118 | } | 119 | } |
119 | } | 120 | #endif |
120 | // printf("false, guid = %i\n", getuid()); | ||
121 | usleep( 100 ); | ||
122 | |||
123 | pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this); | 121 | pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this); |
124 | } | 122 | } |
125 | 123 | ||
@@ -234,13 +232,14 @@ void LoopControl::startAudio() { | |||
234 | qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter); | 232 | qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter); |
235 | 233 | ||
236 | long samplesRead = 0; | 234 | long samplesRead = 0; |
237 | mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream ); | 235 | bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream ); |
238 | long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; | 236 | long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; |
239 | long sampleWaitTime = currentSample - sampleWeShouldBeAt; | 237 | long sampleWaitTime = currentSample - sampleWeShouldBeAt; |
240 | 238 | ||
241 | if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { | 239 | if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { |
242 | usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); | 240 | usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); |
243 | } else if ( sampleWaitTime <= -5000 ) { | 241 | } |
242 | else if ( sampleWaitTime <= -5000 ) { | ||
244 | qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); | 243 | qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); |
245 | //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); | 244 | //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); |
246 | currentSample = sampleWeShouldBeAt; | 245 | currentSample = sampleWeShouldBeAt; |
@@ -249,7 +248,7 @@ void LoopControl::startAudio() { | |||
249 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); | 248 | audioDevice->write( audioBuffer, samplesRead * 2 * channels ); |
250 | audioSampleCounter = currentSample + samplesRead - 1; | 249 | audioSampleCounter = currentSample + samplesRead - 1; |
251 | 250 | ||
252 | moreAudio = audioSampleCounter <= total_audio_samples; | 251 | moreAudio = readOk && (audioSampleCounter <= total_audio_samples); |
253 | 252 | ||
254 | } else { | 253 | } else { |
255 | 254 | ||
@@ -379,23 +378,23 @@ bool LoopControl::init( const QString& filename ) { | |||
379 | int astream = 0; | 378 | int astream = 0; |
380 | 379 | ||
381 | channels = mediaPlayerState->curDecoder()->audioChannels( astream ); | 380 | channels = mediaPlayerState->curDecoder()->audioChannels( astream ); |
382 | DecodeLoopDebug(( "channels = %d\n", channels )); | 381 | qDebug( "LC- channels = %d", channels ); |
383 | 382 | ||
384 | if ( !total_audio_samples ) | 383 | if ( !total_audio_samples ) |
385 | total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream ); | 384 | total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream ); |
386 | 385 | ||
387 | total_audio_samples += 1000; | 386 | // total_audio_samples += 1000; |
388 | 387 | ||
389 | mediaPlayerState->setLength( total_audio_samples ); | 388 | mediaPlayerState->setLength( total_audio_samples ); |
390 | 389 | ||
391 | freq = mediaPlayerState->curDecoder()->audioFrequency( astream ); | 390 | freq = mediaPlayerState->curDecoder()->audioFrequency( astream ); |
392 | DecodeLoopDebug(( "frequency = %d\n", freq )); | 391 | qDebug( "LC- frequency = %d", freq ); |
393 | 392 | ||
394 | audioSampleCounter = 0; | 393 | audioSampleCounter = 0; |
395 | 394 | ||
396 | static const int bytes_per_sample = 2; //16 bit | 395 | int bits_per_sample = mediaPlayerState->curDecoder()->audioBitsPerSample( astream); |
397 | 396 | ||
398 | audioDevice = new AudioDevice( freq, channels, bytes_per_sample ); | 397 | audioDevice = new AudioDevice( freq, channels, bits_per_sample); |
399 | audioBuffer = new char[ audioDevice->bufferSize() ]; | 398 | audioBuffer = new char[ audioDevice->bufferSize() ]; |
400 | channels = audioDevice->channels(); | 399 | channels = audioDevice->channels(); |
401 | 400 | ||