diff options
author | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-11-18 19:43:48 +0200 |
---|---|---|
committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2014-01-08 21:26:38 +0200 |
commit | d2c9b46acaa11cdaf15726cd8e453a0cefc277cf (patch) | |
tree | 63cc864d06b890edf14ed838d25875f0217e8704 /src/pulse/format.c | |
parent | 27e47c72a25846e107b6e450c3a1480a2742382e (diff) | |
download | pulseaudio-d2c9b46acaa11cdaf15726cd8e453a0cefc277cf.tar.gz |
Move pa_format_info_to_sample_spec_fake() to core-format
I will need to use the function from outside libpulse.
I added the channel map argument, because the function will be called
from another function that is expected to initialize the channel map.
I don't know if it's in practice necessary, but it shouldn't do any
harm either.
Diffstat (limited to 'src/pulse/format.c')
-rw-r--r-- | src/pulse/format.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/src/pulse/format.c b/src/pulse/format.c index c0c53bf74..9c7e13e01 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -30,6 +30,7 @@ #include <pulse/internal.h> #include <pulse/xmalloc.h> +#include <pulsecore/core-format.h> #include <pulsecore/core-util.h> #include <pulsecore/i18n.h> #include <pulsecore/macro.h> @@ -215,28 +216,6 @@ pa_format_info* pa_format_info_from_sample_spec(pa_sample_spec *ss, pa_channel_m return f; } -/* For compressed streams */ -static int pa_format_info_to_sample_spec_fake(pa_format_info *f, pa_sample_spec *ss) { - int rate; - - pa_assert(f); - pa_assert(ss); - - /* Note: When we add support for non-IEC61937 encapsulated compressed - * formats, this function should return a non-zero values for these. */ - - ss->format = PA_SAMPLE_S16LE; - ss->channels = 2; - - pa_return_val_if_fail(pa_format_info_get_prop_int(f, PA_PROP_FORMAT_RATE, &rate) == 0, -PA_ERR_INVALID); - ss->rate = (uint32_t) rate; - - if (f->encoding == PA_ENCODING_EAC3_IEC61937) - ss->rate *= 4; - - return 0; -} - /* For PCM streams */ int pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_channel_map *map) { char *sf = NULL, *m = NULL; @@ -247,7 +226,7 @@ int pa_format_info_to_sample_spec(pa_format_info *f, pa_sample_spec *ss, pa_chan pa_assert(ss); if (!pa_format_info_is_pcm(f)) - return pa_format_info_to_sample_spec_fake(f, ss); + return pa_format_info_to_sample_spec_fake(f, ss, map); if (pa_format_info_get_prop_string(f, PA_PROP_FORMAT_SAMPLE_FORMAT, &sf)) goto out; |