RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 08:12:17 +00:00
Code Issues Releases Wiki Activity

ao_pulse: fix tlength calculation

Browse Source 
also remove the now unused non-sensical af_fmt_seconds_to_bytes.
This commit is contained in:
Tom Yan 2018-08-21 08:34:23 +08:00 committed by sfan5
parent 91786fa99c
commit 9d6b15ab32
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
audio/format.c
View File

@ -135,17 +135,6 @@ const char *af_fmt_to_str(int format)
return "??"; return "??";
} }
int af_fmt_seconds_to_bytes(int format, float seconds, int channels, int samplerate)
{
assert(!af_fmt_is_planar(format));
int bps = af_fmt_to_bytes(format);
int framelen = channels * bps;
int bytes = seconds * bps * samplerate;
if (bytes % framelen)
bytes += framelen - (bytes % framelen);
return bytes;
}
void af_fill_silence(void *dst, size_t bytes, int format) void af_fill_silence(void *dst, size_t bytes, int format)
{ {
memset(dst, af_fmt_is_unsigned(format) ? 0x80 : 0, bytes); memset(dst, af_fmt_is_unsigned(format) ? 0x80 : 0, bytes);

3
audio/format.h
View File

@ -64,9 +64,6 @@ bool af_fmt_is_pcm(int format);
int af_fmt_to_planar(int format); int af_fmt_to_planar(int format);
int af_fmt_from_planar(int format); int af_fmt_from_planar(int format);
// Amount of bytes that contain audio of the given duration, aligned to frames.
int af_fmt_seconds_to_bytes(int format, float seconds, int channels, int samplerate);
void af_fill_silence(void *dst, size_t bytes, int format); void af_fill_silence(void *dst, size_t bytes, int format);
void af_get_best_sample_formats(int src_format, int *out_formats); void af_get_best_sample_formats(int src_format, int *out_formats);

6
audio/out/ao_pulse.c
View File

@ -454,11 +454,11 @@ static int init(struct ao *ao)
pa_stream_set_write_callback(priv->stream, stream_request_cb, ao); pa_stream_set_write_callback(priv->stream, stream_request_cb, ao);
pa_stream_set_latency_update_callback(priv->stream, pa_stream_set_latency_update_callback(priv->stream,
stream_latency_update_cb, ao); stream_latency_update_cb, ao);
int buf_size = af_fmt_seconds_to_bytes(ao->format, priv->cfg_buffer / 1000.0, uint32_t buf_size = ao->samplerate * (priv->cfg_buffer / 1000.0) *
ao->channels.num, ao->samplerate); af_fmt_to_bytes(ao->format) * ao->channels.num;
pa_buffer_attr bufattr = { pa_buffer_attr bufattr = {
.maxlength = -1, .maxlength = -1,
.tlength = buf_size > 0 ? buf_size : (uint32_t)-1, .tlength = buf_size > 0 ? buf_size : -1,
.prebuf = -1, .prebuf = -1,
.minreq = -1, .minreq = -1,
.fragsize = -1, .fragsize = -1,