maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto-detect audio encoding if not specified.

Browse Source
This commit is contained in:
Michael Jumper 2013-08-08 17:57:07 -07:00
parent 8bd70053be
commit 58148884a1
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/libguac/audio.c
View File

@ -43,10 +43,46 @@
#include <guacamole/stream.h>
#include <guacamole/audio.h>
#ifdef ENABLE_OGG
#include "ogg_encoder.h"
#endif
#include "wav_encoder.h"
audio_stream* audio_stream_alloc(guac_client* client, audio_encoder* encoder) {
audio_stream* audio;
/* Choose an encoding if not specified */
if (encoder == NULL) {
int i;
/* For each supported mimetype, check for an associated encoder */
for (i=0; client->info.audio_mimetypes[i] != NULL; i++) {
const char* mimetype = client->info.audio_mimetypes[i];
#ifdef ENABLE_OGG
/* If Ogg is supported, done. */
if (strcmp(mimetype, ogg_encoder->mimetype) == 0) {
encoder = ogg_encoder;
break;
}
#endif
/* If wav is supported, done. */
if (strcmp(mimetype, wav_encoder->mimetype) == 0) {
encoder = wav_encoder;
break;
}
} /* end for each mimetype */
}
/* Allocate stream */
audio_stream* audio = (audio_stream*) malloc(sizeof(audio_stream));
audio = (audio_stream*) malloc(sizeof(audio_stream));
audio->client = client;
/* Reset buffer stats */