diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2017-07-27 23:16:40 -0700 |
|---|---|---|
| committer | jsorg71 <jay.sorg@gmail.com> | 2017-08-04 17:24:57 -0700 |
| commit | 021a78f4c65a745b87f89e5ba1dbe20353f8d7fc (patch) | |
| tree | cde846b5054d52c3585b97088a25ccd13ba0533e | |
| parent | bf0d56c3141e3b177020ecd78d449f46555154ec (diff) | |
| download | xrdp-proprietary-021a78f4c65a745b87f89e5ba1dbe20353f8d7fc.tar.gz xrdp-proprietary-021a78f4c65a745b87f89e5ba1dbe20353f8d7fc.zip | |
chansrv: sound, use WAVE_FORMAT_AAC not WAVE_FORMAT_AAC_MS
| -rw-r--r-- | common/xrdp_constants.h | 2 | ||||
| -rw-r--r-- | sesman/chansrv/sound.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/xrdp_constants.h b/common/xrdp_constants.h index 3512cb1e..f1b13234 100644 --- a/common/xrdp_constants.h +++ b/common/xrdp_constants.h @@ -401,7 +401,7 @@ #define WAVE_FORMAT_MULAW 0x0007 #define WAVE_FORMAT_MPEGLAYER3 0x0055 #define WAVE_FORMAT_OPUS 0x0069 -#define WAVE_FORMAT_AAC_MS 0xA106 +#define WAVE_FORMAT_AAC 0xA106 /* Virtual channel options */ #define XR_CHANNEL_OPTION_SHOW_PROTOCOL 0x00200000 diff --git a/sesman/chansrv/sound.c b/sesman/chansrv/sound.c index 5a0db94b..9242ccd3 100644 --- a/sesman/chansrv/sound.c +++ b/sesman/chansrv/sound.c @@ -123,7 +123,7 @@ static struct xr_wave_format_ex g_pcm_44100 = static tui8 g_fdk_aac_44100_data[] = { 0 }; static struct xr_wave_format_ex g_fdk_aac_44100 = { - WAVE_FORMAT_AAC_MS, /* wFormatTag */ + WAVE_FORMAT_AAC, /* wFormatTag */ 2, /* num of channels */ 44100, /* samples per sec */ 12000, /* avg bytes per sec */ @@ -396,7 +396,7 @@ sound_process_output_format(int aindex, int wFormatTag, int nChannels, switch(wFormatTag) { - case WAVE_FORMAT_AAC_MS: + case WAVE_FORMAT_AAC: LOG(0, ("wFormatTag, fdk aac")); g_client_does_fdk_aac = 1; g_client_fdk_aac_index = aindex; |