diff options
author | Daniel Mack <daniel@caiaq.de> | 2009-11-11 10:48:39 +0100 |
---|---|---|
committer | Daniel Mack <daniel@caiaq.de> | 2009-11-11 10:48:39 +0100 |
commit | ed7642ebac32bde8d9c47f3a1d8eabf75c3ea986 (patch) | |
tree | 9db77a271430da8abf7b6d11079bc660f7428094 /src/pulsecore/sink-input.c | |
parent | 21ffcd55a5a425870f8f4c3b4933bc7cb352e339 (diff) | |
parent | 22946427624afde1d53973fa5a2e9e2041ffc5b7 (diff) |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/pulsecore/sink-input.c')
-rw-r--r-- | src/pulsecore/sink-input.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index 1af2823f..aa84ccb1 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -717,14 +717,15 @@ void pa_sink_input_peek(pa_sink_input *i, size_t slength /* in sink frames */, p pa_memchunk rchunk; pa_resampler_run(i->thread_info.resampler, &wchunk, &rchunk); - if (nvfs) { - pa_memchunk_make_writable(&rchunk, 0); - pa_volume_memchunk(&rchunk, &i->sink->sample_spec, &i->volume_factor_sink); - } - /* pa_log_debug("pushing %lu", (unsigned long) rchunk.length); */ if (rchunk.memblock) { + + if (nvfs) { + pa_memchunk_make_writable(&rchunk, 0); + pa_volume_memchunk(&rchunk, &i->sink->sample_spec, &i->volume_factor_sink); + } + pa_memblockq_push_align(i->thread_info.render_memblockq, &rchunk); pa_memblock_unref(rchunk.memblock); } |