Message ID | 20220611181604.5297-1-cus@passwd.hu |
---|---|
State | Accepted |
Commit | b83032899af3fa355f94a7d77a0334fb56e1d919 |
Headers | show |
Series | [FFmpeg-devel,1/3] Revert "avdevice/pulse_audio_dec: only set adjust latency flag if fragment_size is not set" | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
On Sat, 11 Jun 2022, Marton Balint wrote: > This reverts commit 7f059a250bb7bcbf7bba537c1a059a5934413035. > > Apparently adjusting latency makes a difference even if fragment size is specifed. > > Signed-off-by: Marton Balint <cus@passwd.hu> > --- > libavdevice/pulse_audio_dec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavdevice/pulse_audio_dec.c b/libavdevice/pulse_audio_dec.c > index a33d1afd1f..ed094fd250 100644 > --- a/libavdevice/pulse_audio_dec.c > +++ b/libavdevice/pulse_audio_dec.c > @@ -220,7 +220,7 @@ static av_cold int pulse_read_header(AVFormatContext *s) > > ret = pa_stream_connect_record(pd->stream, device, &attr, > PA_STREAM_INTERPOLATE_TIMING > - | (pd->fragment_size == -1 ? PA_STREAM_ADJUST_LATENCY : 0) > + |PA_STREAM_ADJUST_LATENCY > |PA_STREAM_AUTO_TIMING_UPDATE); Applied the series. Regards, Marton
diff --git a/libavdevice/pulse_audio_dec.c b/libavdevice/pulse_audio_dec.c index a33d1afd1f..ed094fd250 100644 --- a/libavdevice/pulse_audio_dec.c +++ b/libavdevice/pulse_audio_dec.c @@ -220,7 +220,7 @@ static av_cold int pulse_read_header(AVFormatContext *s) ret = pa_stream_connect_record(pd->stream, device, &attr, PA_STREAM_INTERPOLATE_TIMING - | (pd->fragment_size == -1 ? PA_STREAM_ADJUST_LATENCY : 0) + |PA_STREAM_ADJUST_LATENCY |PA_STREAM_AUTO_TIMING_UPDATE); if (ret < 0) {
This reverts commit 7f059a250bb7bcbf7bba537c1a059a5934413035. Apparently adjusting latency makes a difference even if fragment size is specifed. Signed-off-by: Marton Balint <cus@passwd.hu> --- libavdevice/pulse_audio_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)