mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

when loading sound files, initialize channel map data properly

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@777 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-04-22 21:50:15 +00:00
parent 5e50f84e71
commit ec65ca6ae7
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/polypcore/core-scache.c
View file

@ -157,6 +157,7 @@ int pa_scache_add_item(pa_core *c, const char *name, const pa_sample_spec *ss, c
int pa_scache_add_file(pa_core *c, const char *name, const char *filename, uint32_t *idx) { int pa_scache_add_file(pa_core *c, const char *name, const char *filename, uint32_t *idx) {
pa_sample_spec ss; pa_sample_spec ss;
pa_channel_map map;
pa_memchunk chunk; pa_memchunk chunk;
int r; int r;
@ -167,10 +168,10 @@ int pa_scache_add_file(pa_core *c, const char *name, const char *filename, uint3
filename = buf; filename = buf;
#endif #endif
if (pa_sound_file_load(filename, &ss, &chunk, c->memblock_stat) < 0) if (pa_sound_file_load(filename, &ss, &map, &chunk, c->memblock_stat) < 0)
return -1; return -1;
r = pa_scache_add_item(c, name, &ss, NULL, &chunk, idx); r = pa_scache_add_item(c, name, &ss, &map, &chunk, idx);
pa_memblock_unref(chunk.memblock); pa_memblock_unref(chunk.memblock);
return r; return r;
@ -252,7 +253,7 @@ int pa_scache_play_item(pa_core *c, const char *name, pa_sink *sink, const pa_cv
return -1; return -1;
if (e->lazy && !e->memchunk.memblock) { if (e->lazy && !e->memchunk.memblock) {
if (pa_sound_file_load(e->filename, &e->sample_spec, &e->memchunk, c->memblock_stat) < 0) if (pa_sound_file_load(e->filename, &e->sample_spec, &e->channel_map, &e->memchunk, c->memblock_stat) < 0)
return -1; return -1;
pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE|PA_SUBSCRIPTION_EVENT_CHANGE, e->index); pa_subscription_post(c, PA_SUBSCRIPTION_EVENT_SAMPLE_CACHE|PA_SUBSCRIPTION_EVENT_CHANGE, e->index);

5
src/polypcore/sound-file.c
View file

@ -35,7 +35,7 @@
#define MAX_FILE_SIZE (1024*1024) #define MAX_FILE_SIZE (1024*1024)
int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_memchunk *chunk, pa_memblock_stat *s) { int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_channel_map *map, pa_memchunk *chunk, pa_memblock_stat *s) {
SNDFILE*sf = NULL; SNDFILE*sf = NULL;
SF_INFO sfinfo; SF_INFO sfinfo;
int ret = -1; int ret = -1;
@ -74,6 +74,9 @@ int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_memchunk *chunk
pa_log(__FILE__": Unsupported sample format in file %s", fname); pa_log(__FILE__": Unsupported sample format in file %s", fname);
goto finish; goto finish;
} }
if (map)
pa_channel_map_init_auto(map, ss->channels);
if ((l = pa_frame_size(ss)*sfinfo.frames) > MAX_FILE_SIZE) { if ((l = pa_frame_size(ss)*sfinfo.frames) > MAX_FILE_SIZE) {
pa_log(__FILE__": File too large"); pa_log(__FILE__": File too large");

3
src/polypcore/sound-file.h
View file

@ -23,9 +23,10 @@
***/ ***/
#include <polyp/sample.h> #include <polyp/sample.h>
#include <polyp/channelmap.h>
#include <polypcore/memchunk.h> #include <polypcore/memchunk.h>
int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_memchunk *chunk, pa_memblock_stat *s); int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_channel_map *map, pa_memchunk *chunk, pa_memblock_stat *s);
int pa_sound_file_too_big_to_cache(const char *fname); int pa_sound_file_too_big_to_cache(const char *fname);