mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-05 13:29:57 -05:00
6bd34156b1
If the virtual sink is moved to a new master right after it has been created, then the virtual sink input's memblockq can be rewound to a negative read index. The data written prior to the move starts from index zero, so after the rewind there's a bit of silence. If the memblockq doesn't have a silence memchunk set, then pa_memblockq_peek() will return zero in such case, and the returned memchunk's memblock pointer will be NULL. That scenario wasn't taken into account in the implementation of sink_input_pop_cb. Setting a silence memchunk for the memblockq solves this problem, because pa_memblock_peek() will now return a valid memblock if the read index happens to point to a hole in the memblockq. I believe this isn't the best possible solution, though. It doesn't really make sense to rewind the sink input's memblockq beyond index 0 in the first place, because now when the stream starts to play to the new master sink, there's some unnecessary silence before the actual data starts. This is a small problem, though, and I don't grok the rewinding system well enough to know how to fix this issue properly. I went through all files that call pa_memblockq_peek() to see if there are more similar bugs. play-memblockq.c was the only one that looked to me like it might be broken in the same way. I didn't try reproducing the bug with play-memblockq.c, though, so I just added a FIXME comment there.
62 lines
2.1 KiB
C
62 lines
2.1 KiB
C
#ifndef foortphfoo
|
|
#define foortphfoo
|
|
|
|
/***
|
|
This file is part of PulseAudio.
|
|
|
|
Copyright 2006 Lennart Poettering
|
|
|
|
PulseAudio is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU Lesser General Public License as published
|
|
by the Free Software Foundation; either version 2.1 of the License,
|
|
or (at your option) any later version.
|
|
|
|
PulseAudio is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
|
along with PulseAudio; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
USA.
|
|
***/
|
|
|
|
#include <inttypes.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/types.h>
|
|
#include <pulsecore/memblockq.h>
|
|
#include <pulsecore/memchunk.h>
|
|
|
|
typedef struct pa_rtp_context {
|
|
int fd;
|
|
uint16_t sequence;
|
|
uint32_t timestamp;
|
|
uint32_t ssrc;
|
|
uint8_t payload;
|
|
size_t frame_size;
|
|
|
|
pa_memchunk memchunk;
|
|
} pa_rtp_context;
|
|
|
|
pa_rtp_context* pa_rtp_context_init_send(pa_rtp_context *c, int fd, uint32_t ssrc, uint8_t payload, size_t frame_size);
|
|
|
|
/* If the memblockq doesn't have a silence memchunk set, then the caller must
|
|
* guarantee that the current read index doesn't point to a hole. */
|
|
int pa_rtp_send(pa_rtp_context *c, size_t size, pa_memblockq *q);
|
|
|
|
pa_rtp_context* pa_rtp_context_init_recv(pa_rtp_context *c, int fd, size_t frame_size);
|
|
int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct timeval *tstamp);
|
|
|
|
void pa_rtp_context_destroy(pa_rtp_context *c);
|
|
|
|
pa_sample_spec* pa_rtp_sample_spec_fixup(pa_sample_spec *ss);
|
|
int pa_rtp_sample_spec_valid(const pa_sample_spec *ss);
|
|
|
|
uint8_t pa_rtp_payload_from_sample_spec(const pa_sample_spec *ss);
|
|
pa_sample_spec *pa_rtp_sample_spec_from_payload(uint8_t payload, pa_sample_spec *ss);
|
|
|
|
const char* pa_rtp_format_to_string(pa_sample_format_t f);
|
|
pa_sample_format_t pa_rtp_string_to_format(const char *s);
|
|
|
|
#endif
|