From ab59c5d518433220474785a9bd330e30b5b08b07 Mon Sep 17 00:00:00 2001 From: martii Date: Wed, 30 Oct 2013 18:28:52 +0100 Subject: [PATCH] libspark/audio: align to player2 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/d13fc044738d6eea17d07a95094b87da39577dfe Author: martii Date: 2013-10-30 (Wed, 30 Oct 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libspark/audio.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/libspark/audio.cpp b/libspark/audio.cpp index bbf163b..b00bc06 100644 --- a/libspark/audio.cpp +++ b/libspark/audio.cpp @@ -153,15 +153,14 @@ void cAudio::SetSyncMode(AVSYNC_TYPE Mode) ioctl(fd, AUDIO_SET_AV_SYNC, Mode); } -//AUDIO_ENCODING_AC3 -#define AUDIO_STREAMTYPE_AC3 0 -//AUDIO_ENCODING_MPEG2 -#define AUDIO_STREAMTYPE_MPEG 1 -//AUDIO_ENCODING_DTS -#define AUDIO_STREAMTYPE_DTS 2 +// E2 streamtype values. These correspond to +// player2/linux/drivers/media/dvb/stm/dvb/dvb_audio.c:AudioIoctlSetBypassMode +#define AUDIO_STREAMTYPE_AC3 0 +#define AUDIO_STREAMTYPE_MPEG 1 +#define AUDIO_STREAMTYPE_DTS 2 +#define AUDIO_STREAMTYPE_AAC 8 +#define AUDIO_STREAMTYPE_AACHE 9 -#define AUDIO_ENCODING_LPCM 2 -#define AUDIO_ENCODING_LPCMA 11 void cAudio::SetStreamType(AUDIO_FORMAT type) { int bypass = AUDIO_STREAMTYPE_MPEG; @@ -174,10 +173,15 @@ void cAudio::SetStreamType(AUDIO_FORMAT type) case AUDIO_FMT_DOLBY_DIGITAL: bypass = AUDIO_STREAMTYPE_AC3; break; + case AUDIO_FMT_AAC: + bypass = AUDIO_STREAMTYPE_AAC; + break; + case AUDIO_FMT_AAC_PLUS: + bypass = AUDIO_STREAMTYPE_AACHE; + break; case AUDIO_FMT_DTS: bypass = AUDIO_STREAMTYPE_DTS; break; - case AUDIO_FMT_MPEG: default: break; }