scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 16:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Audio sender: don't auto resample to 48000

Browse Source 
+ some rework - audio_frame2 has now methods for changing bps and
resampling
This commit is contained in:
Martin Pulec
2015-07-23 19:40:12 +02:00
parent d1fc89981c
commit 899ca0b56f
7 changed files with 155 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/audio/codec.cpp
View File

@@ -343,11 +343,6 @@ void audio_codec_done(struct audio_codec_state *s)
free(s);
}
const int *audio_codec_get_supported_bps(struct audio_codec_state *s)
{
return audio_codecs[s->index]->supported_bytes_per_second;
}
audio_codec_t get_audio_codec(const char *codec_str) {
char *codec = strdup(codec_str);
if (strchr(codec, ':')) {
@@ -383,6 +378,9 @@ static char *get_val_from_cfg(const char *audio_codec_cfg, const char *key)
return NULL;
}
/**
* @returns user specified sample rate or 0 if unspecified
*/
int get_audio_codec_sample_rate(const char *audio_codec_cfg)
{
char *val = get_val_from_cfg(audio_codec_cfg, "sample_rate=");
@@ -391,7 +389,7 @@ int get_audio_codec_sample_rate(const char *audio_codec_cfg)
free(val);
return ret;
} else {
return 48000;
return 0;
}
}