use openal as default if possible

This commit is contained in:
wang-bin
2014-09-04 23:55:56 +08:00
parent f1c9cd3a6a
commit 8d75792eed
2 changed files with 23 additions and 8 deletions
+22 -7
View File
@@ -132,6 +132,20 @@ AVPlayer::AVPlayer(QObject *parent) :
<< VideoDecoderId_Cedarv
#endif //QTAV_HAVE(CEDARV)
<< VideoDecoderId_FFmpeg;
audioout_ids
#if QTAV_HAVE(OPENAL)
<< AudioOutputId_OpenAL
#endif
#if QTAV_HAVE(PORTAUDIO)
<< AudioOutputId_PortAudio
#endif
#if QTAV_HAVE(OPENSL)
<< AudioOutputId_OpenSL
#endif
#if QTAV_HAVE(DSound)
<< AudioOutputId_DSound
#endif
;
}
AVPlayer::~AVPlayer()
@@ -1280,13 +1294,14 @@ bool AVPlayer::setupAudioThread()
}
//TODO: setAudioOutput() like vo
if (!_audio && ao_enable) {
qDebug("new audio output");
//TODO: use priority?
#if QTAV_HAVE(PORTAUDIO)
_audio = AudioOutputFactory::create(AudioOutputId_PortAudio);
#elif QTAV_HAVE(OPENAL)
_audio = AudioOutputFactory::create(AudioOutputId_OpenAL);
#endif
foreach (AudioOutputId aoid, audioout_ids) {
qDebug("trying audio output '%s'", AudioOutputFactory::name(aoid).c_str());
_audio = AudioOutputFactory::create(aoid);
if (_audio) {
qDebug("audio output found.");
break;
}
}
}
if (!_audio) {
// TODO: only when no audio stream or user disable audio stream. running an audio thread without sound is waste resource?
+1 -1
View File
@@ -339,7 +339,7 @@ private:
bool ao_enable;
OutputSet *mpVOSet, *mpAOSet;
QVector<VideoDecoderId> vcodec_ids;
QVector<AudioOutputId> audioout_ids;
int mBrightness, mContrast, mSaturation;
QVariantHash audio_codec_opt, video_codec_opt;