2013-10-29 21:38:29 +00:00
|
|
|
/*
|
|
|
|
* This file is part of MPlayer.
|
|
|
|
*
|
|
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* MPlayer 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 General Public License along
|
|
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <inttypes.h>
|
|
|
|
#include <math.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
#include "talloc.h"
|
|
|
|
|
2013-12-17 01:39:45 +00:00
|
|
|
#include "common/msg.h"
|
2013-12-17 01:02:25 +00:00
|
|
|
#include "options/options.h"
|
2013-12-17 01:39:45 +00:00
|
|
|
#include "common/common.h"
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
#include "audio/mixer.h"
|
2013-11-10 22:38:18 +00:00
|
|
|
#include "audio/audio.h"
|
|
|
|
#include "audio/audio_buffer.h"
|
2013-10-29 21:38:29 +00:00
|
|
|
#include "audio/decode/dec_audio.h"
|
|
|
|
#include "audio/filter/af.h"
|
|
|
|
#include "audio/out/ao.h"
|
|
|
|
#include "demux/demux.h"
|
2013-11-23 20:36:20 +00:00
|
|
|
#include "video/decode/dec_video.h"
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-12-17 00:08:53 +00:00
|
|
|
#include "core.h"
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
static int build_afilter_chain(struct MPContext *mpctx)
|
|
|
|
{
|
2013-11-23 20:22:17 +00:00
|
|
|
struct dec_audio *d_audio = mpctx->d_audio;
|
2013-10-29 21:38:29 +00:00
|
|
|
struct ao *ao = mpctx->ao;
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
audio: use the decoder buffer's format, not sh_audio
When the decoder detects a format change, it overwrites the values
stored in sh_audio (this affects the members sample_format, samplerate,
channels). In the case when the old audio data still needs to be
played/filtered, the audio format as identified by sh_audio and the
format used for the decoder buffer can mismatch. In particular, they
will mismatch in the very unlikely but possible case the audio chain is
reinitialized while old data is draining during a format change.
Or in other words, sh_audio might contain the new format, while the
audio chain is still configured to use the old format.
Currently, the audio code (player/audio.c and init_audio_filters) access
sh_audio to get the current format. This is in theory incorrect for the
reasons mentioned above. Use the decoder buffer's format instead, which
should be correct at any point.
2013-11-18 12:57:17 +00:00
|
|
|
|
2013-11-23 20:22:17 +00:00
|
|
|
if (!d_audio)
|
audio: use the decoder buffer's format, not sh_audio
When the decoder detects a format change, it overwrites the values
stored in sh_audio (this affects the members sample_format, samplerate,
channels). In the case when the old audio data still needs to be
played/filtered, the audio format as identified by sh_audio and the
format used for the decoder buffer can mismatch. In particular, they
will mismatch in the very unlikely but possible case the audio chain is
reinitialized while old data is draining during a format change.
Or in other words, sh_audio might contain the new format, while the
audio chain is still configured to use the old format.
Currently, the audio code (player/audio.c and init_audio_filters) access
sh_audio to get the current format. This is in theory incorrect for the
reasons mentioned above. Use the decoder buffer's format instead, which
should be correct at any point.
2013-11-18 12:57:17 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
struct mp_audio in_format;
|
2013-11-23 20:22:17 +00:00
|
|
|
mp_audio_buffer_get_format(d_audio->decode_buffer, &in_format);
|
audio: use the decoder buffer's format, not sh_audio
When the decoder detects a format change, it overwrites the values
stored in sh_audio (this affects the members sample_format, samplerate,
channels). In the case when the old audio data still needs to be
played/filtered, the audio format as identified by sh_audio and the
format used for the decoder buffer can mismatch. In particular, they
will mismatch in the very unlikely but possible case the audio chain is
reinitialized while old data is draining during a format change.
Or in other words, sh_audio might contain the new format, while the
audio chain is still configured to use the old format.
Currently, the audio code (player/audio.c and init_audio_filters) access
sh_audio to get the current format. This is in theory incorrect for the
reasons mentioned above. Use the decoder buffer's format instead, which
should be correct at any point.
2013-11-18 12:57:17 +00:00
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
int new_srate;
|
2013-11-23 20:22:17 +00:00
|
|
|
if (af_control_any_rev(d_audio->afilter, AF_CONTROL_SET_PLAYBACK_SPEED,
|
2013-10-29 21:38:29 +00:00
|
|
|
&opts->playback_speed))
|
audio: use the decoder buffer's format, not sh_audio
When the decoder detects a format change, it overwrites the values
stored in sh_audio (this affects the members sample_format, samplerate,
channels). In the case when the old audio data still needs to be
played/filtered, the audio format as identified by sh_audio and the
format used for the decoder buffer can mismatch. In particular, they
will mismatch in the very unlikely but possible case the audio chain is
reinitialized while old data is draining during a format change.
Or in other words, sh_audio might contain the new format, while the
audio chain is still configured to use the old format.
Currently, the audio code (player/audio.c and init_audio_filters) access
sh_audio to get the current format. This is in theory incorrect for the
reasons mentioned above. Use the decoder buffer's format instead, which
should be correct at any point.
2013-11-18 12:57:17 +00:00
|
|
|
new_srate = in_format.rate;
|
2013-10-29 21:38:29 +00:00
|
|
|
else {
|
audio: use the decoder buffer's format, not sh_audio
When the decoder detects a format change, it overwrites the values
stored in sh_audio (this affects the members sample_format, samplerate,
channels). In the case when the old audio data still needs to be
played/filtered, the audio format as identified by sh_audio and the
format used for the decoder buffer can mismatch. In particular, they
will mismatch in the very unlikely but possible case the audio chain is
reinitialized while old data is draining during a format change.
Or in other words, sh_audio might contain the new format, while the
audio chain is still configured to use the old format.
Currently, the audio code (player/audio.c and init_audio_filters) access
sh_audio to get the current format. This is in theory incorrect for the
reasons mentioned above. Use the decoder buffer's format instead, which
should be correct at any point.
2013-11-18 12:57:17 +00:00
|
|
|
new_srate = in_format.rate * opts->playback_speed;
|
2013-10-29 21:38:29 +00:00
|
|
|
if (new_srate != ao->samplerate) {
|
|
|
|
// limits are taken from libaf/af_resample.c
|
|
|
|
if (new_srate < 8000)
|
|
|
|
new_srate = 8000;
|
|
|
|
if (new_srate > 192000)
|
|
|
|
new_srate = 192000;
|
audio: use the decoder buffer's format, not sh_audio
When the decoder detects a format change, it overwrites the values
stored in sh_audio (this affects the members sample_format, samplerate,
channels). In the case when the old audio data still needs to be
played/filtered, the audio format as identified by sh_audio and the
format used for the decoder buffer can mismatch. In particular, they
will mismatch in the very unlikely but possible case the audio chain is
reinitialized while old data is draining during a format change.
Or in other words, sh_audio might contain the new format, while the
audio chain is still configured to use the old format.
Currently, the audio code (player/audio.c and init_audio_filters) access
sh_audio to get the current format. This is in theory incorrect for the
reasons mentioned above. Use the decoder buffer's format instead, which
should be correct at any point.
2013-11-18 12:57:17 +00:00
|
|
|
opts->playback_speed = new_srate / (double)in_format.rate;
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
}
|
2013-11-23 20:22:17 +00:00
|
|
|
return audio_init_filters(d_audio, new_srate,
|
2013-10-29 21:38:29 +00:00
|
|
|
&ao->samplerate, &ao->channels, &ao->format);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int recreate_audio_filters(struct MPContext *mpctx)
|
|
|
|
{
|
2013-11-23 20:22:17 +00:00
|
|
|
assert(mpctx->d_audio);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
// init audio filters:
|
|
|
|
if (!build_afilter_chain(mpctx)) {
|
|
|
|
MP_ERR(mpctx, "Couldn't find matching filter/ao format!\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-11-23 20:22:17 +00:00
|
|
|
mixer_reinit_audio(mpctx->mixer, mpctx->ao, mpctx->d_audio->afilter);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int reinit_audio_filters(struct MPContext *mpctx)
|
|
|
|
{
|
2013-11-23 20:22:17 +00:00
|
|
|
struct dec_audio *d_audio = mpctx->d_audio;
|
|
|
|
if (!d_audio)
|
2013-10-29 21:38:29 +00:00
|
|
|
return -2;
|
|
|
|
|
2013-11-23 20:22:17 +00:00
|
|
|
af_uninit(mpctx->d_audio->afilter);
|
|
|
|
if (af_init(mpctx->d_audio->afilter) < 0)
|
2013-10-29 21:38:29 +00:00
|
|
|
return -1;
|
|
|
|
if (recreate_audio_filters(mpctx) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void reinit_audio_chain(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
2013-11-23 20:22:17 +00:00
|
|
|
struct sh_stream *sh = init_demux_stream(mpctx, STREAM_AUDIO);
|
|
|
|
if (!sh) {
|
2013-10-29 21:38:29 +00:00
|
|
|
uninit_player(mpctx, INITIALIZED_AO);
|
|
|
|
goto no_audio;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(mpctx->initialized_flags & INITIALIZED_ACODEC)) {
|
|
|
|
mpctx->initialized_flags |= INITIALIZED_ACODEC;
|
2013-11-23 20:22:17 +00:00
|
|
|
assert(!mpctx->d_audio);
|
|
|
|
mpctx->d_audio = talloc_zero(NULL, struct dec_audio);
|
|
|
|
mpctx->d_audio->opts = opts;
|
|
|
|
mpctx->d_audio->header = sh;
|
|
|
|
if (!audio_init_best_codec(mpctx->d_audio, opts->audio_decoders))
|
|
|
|
goto init_error;
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
2013-11-23 20:22:17 +00:00
|
|
|
assert(mpctx->d_audio);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
audio: use the decoder buffer's format, not sh_audio
When the decoder detects a format change, it overwrites the values
stored in sh_audio (this affects the members sample_format, samplerate,
channels). In the case when the old audio data still needs to be
played/filtered, the audio format as identified by sh_audio and the
format used for the decoder buffer can mismatch. In particular, they
will mismatch in the very unlikely but possible case the audio chain is
reinitialized while old data is draining during a format change.
Or in other words, sh_audio might contain the new format, while the
audio chain is still configured to use the old format.
Currently, the audio code (player/audio.c and init_audio_filters) access
sh_audio to get the current format. This is in theory incorrect for the
reasons mentioned above. Use the decoder buffer's format instead, which
should be correct at any point.
2013-11-18 12:57:17 +00:00
|
|
|
struct mp_audio in_format;
|
2013-11-23 20:22:17 +00:00
|
|
|
mp_audio_buffer_get_format(mpctx->d_audio->decode_buffer, &in_format);
|
audio: use the decoder buffer's format, not sh_audio
When the decoder detects a format change, it overwrites the values
stored in sh_audio (this affects the members sample_format, samplerate,
channels). In the case when the old audio data still needs to be
played/filtered, the audio format as identified by sh_audio and the
format used for the decoder buffer can mismatch. In particular, they
will mismatch in the very unlikely but possible case the audio chain is
reinitialized while old data is draining during a format change.
Or in other words, sh_audio might contain the new format, while the
audio chain is still configured to use the old format.
Currently, the audio code (player/audio.c and init_audio_filters) access
sh_audio to get the current format. This is in theory incorrect for the
reasons mentioned above. Use the decoder buffer's format instead, which
should be correct at any point.
2013-11-18 12:57:17 +00:00
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
int ao_srate = opts->force_srate;
|
|
|
|
int ao_format = opts->audio_output_format;
|
|
|
|
struct mp_chmap ao_channels = {0};
|
|
|
|
if (mpctx->initialized_flags & INITIALIZED_AO) {
|
|
|
|
ao_srate = mpctx->ao->samplerate;
|
|
|
|
ao_format = mpctx->ao->format;
|
|
|
|
ao_channels = mpctx->ao->channels;
|
|
|
|
} else {
|
|
|
|
// Automatic downmix
|
|
|
|
if (mp_chmap_is_stereo(&opts->audio_output_channels) &&
|
audio: use the decoder buffer's format, not sh_audio
When the decoder detects a format change, it overwrites the values
stored in sh_audio (this affects the members sample_format, samplerate,
channels). In the case when the old audio data still needs to be
played/filtered, the audio format as identified by sh_audio and the
format used for the decoder buffer can mismatch. In particular, they
will mismatch in the very unlikely but possible case the audio chain is
reinitialized while old data is draining during a format change.
Or in other words, sh_audio might contain the new format, while the
audio chain is still configured to use the old format.
Currently, the audio code (player/audio.c and init_audio_filters) access
sh_audio to get the current format. This is in theory incorrect for the
reasons mentioned above. Use the decoder buffer's format instead, which
should be correct at any point.
2013-11-18 12:57:17 +00:00
|
|
|
!mp_chmap_is_stereo(&in_format.channels))
|
2013-10-29 21:38:29 +00:00
|
|
|
{
|
|
|
|
mp_chmap_from_channels(&ao_channels, 2);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Determine what the filter chain outputs. build_afilter_chain() also
|
|
|
|
// needs this for testing whether playback speed is changed by resampling
|
|
|
|
// or using a special filter.
|
2013-11-23 20:22:17 +00:00
|
|
|
if (!audio_init_filters(mpctx->d_audio, // preliminary init
|
2013-10-29 21:38:29 +00:00
|
|
|
// input:
|
audio: use the decoder buffer's format, not sh_audio
When the decoder detects a format change, it overwrites the values
stored in sh_audio (this affects the members sample_format, samplerate,
channels). In the case when the old audio data still needs to be
played/filtered, the audio format as identified by sh_audio and the
format used for the decoder buffer can mismatch. In particular, they
will mismatch in the very unlikely but possible case the audio chain is
reinitialized while old data is draining during a format change.
Or in other words, sh_audio might contain the new format, while the
audio chain is still configured to use the old format.
Currently, the audio code (player/audio.c and init_audio_filters) access
sh_audio to get the current format. This is in theory incorrect for the
reasons mentioned above. Use the decoder buffer's format instead, which
should be correct at any point.
2013-11-18 12:57:17 +00:00
|
|
|
in_format.rate,
|
2013-10-29 21:38:29 +00:00
|
|
|
// output:
|
|
|
|
&ao_srate, &ao_channels, &ao_format)) {
|
|
|
|
MP_ERR(mpctx, "Error at audio filter chain pre-init!\n");
|
|
|
|
goto init_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(mpctx->initialized_flags & INITIALIZED_AO)) {
|
|
|
|
mpctx->initialized_flags |= INITIALIZED_AO;
|
|
|
|
mp_chmap_remove_useless_channels(&ao_channels,
|
|
|
|
&opts->audio_output_channels);
|
|
|
|
mpctx->ao = ao_init_best(mpctx->global, mpctx->input,
|
|
|
|
mpctx->encode_lavc_ctx, ao_srate, ao_format,
|
|
|
|
ao_channels);
|
|
|
|
struct ao *ao = mpctx->ao;
|
|
|
|
if (!ao) {
|
|
|
|
MP_ERR(mpctx, "Could not open/initialize audio device -> no sound.\n");
|
|
|
|
goto init_error;
|
|
|
|
}
|
2013-11-10 22:38:18 +00:00
|
|
|
|
|
|
|
ao->buffer = mp_audio_buffer_create(ao);
|
|
|
|
mp_audio_buffer_reinit_fmt(ao->buffer, ao->format, &ao->channels,
|
|
|
|
ao->samplerate);
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
char *s = mp_audio_fmt_to_str(ao->samplerate, &ao->channels, ao->format);
|
|
|
|
MP_INFO(mpctx, "AO: [%s] %s\n", ao->driver->name, s);
|
|
|
|
talloc_free(s);
|
|
|
|
MP_VERBOSE(mpctx, "AO: Description: %s\n", ao->driver->description);
|
2013-11-09 23:49:13 +00:00
|
|
|
update_window_title(mpctx, true);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (recreate_audio_filters(mpctx) < 0)
|
|
|
|
goto init_error;
|
|
|
|
|
|
|
|
mpctx->syncing_audio = true;
|
|
|
|
return;
|
|
|
|
|
|
|
|
init_error:
|
|
|
|
uninit_player(mpctx, INITIALIZED_ACODEC | INITIALIZED_AO);
|
|
|
|
cleanup_demux_stream(mpctx, STREAM_AUDIO);
|
|
|
|
no_audio:
|
|
|
|
mpctx->current_track[STREAM_AUDIO] = NULL;
|
|
|
|
MP_INFO(mpctx, "Audio: no audio\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return pts value corresponding to the end point of audio written to the
|
|
|
|
// ao so far.
|
|
|
|
double written_audio_pts(struct MPContext *mpctx)
|
|
|
|
{
|
2013-11-23 20:22:17 +00:00
|
|
|
struct dec_audio *d_audio = mpctx->d_audio;
|
|
|
|
if (!d_audio)
|
2013-10-29 21:38:29 +00:00
|
|
|
return MP_NOPTS_VALUE;
|
|
|
|
|
audio: use the decoder buffer's format, not sh_audio
When the decoder detects a format change, it overwrites the values
stored in sh_audio (this affects the members sample_format, samplerate,
channels). In the case when the old audio data still needs to be
played/filtered, the audio format as identified by sh_audio and the
format used for the decoder buffer can mismatch. In particular, they
will mismatch in the very unlikely but possible case the audio chain is
reinitialized while old data is draining during a format change.
Or in other words, sh_audio might contain the new format, while the
audio chain is still configured to use the old format.
Currently, the audio code (player/audio.c and init_audio_filters) access
sh_audio to get the current format. This is in theory incorrect for the
reasons mentioned above. Use the decoder buffer's format instead, which
should be correct at any point.
2013-11-18 12:57:17 +00:00
|
|
|
struct mp_audio in_format;
|
2013-11-23 20:22:17 +00:00
|
|
|
mp_audio_buffer_get_format(d_audio->decode_buffer, &in_format);
|
audio: use the decoder buffer's format, not sh_audio
When the decoder detects a format change, it overwrites the values
stored in sh_audio (this affects the members sample_format, samplerate,
channels). In the case when the old audio data still needs to be
played/filtered, the audio format as identified by sh_audio and the
format used for the decoder buffer can mismatch. In particular, they
will mismatch in the very unlikely but possible case the audio chain is
reinitialized while old data is draining during a format change.
Or in other words, sh_audio might contain the new format, while the
audio chain is still configured to use the old format.
Currently, the audio code (player/audio.c and init_audio_filters) access
sh_audio to get the current format. This is in theory incorrect for the
reasons mentioned above. Use the decoder buffer's format instead, which
should be correct at any point.
2013-11-18 12:57:17 +00:00
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
// first calculate the end pts of audio that has been output by decoder
|
2013-11-23 20:22:17 +00:00
|
|
|
double a_pts = d_audio->pts;
|
2013-10-29 21:38:29 +00:00
|
|
|
if (a_pts == MP_NOPTS_VALUE)
|
|
|
|
return MP_NOPTS_VALUE;
|
|
|
|
|
2013-11-23 20:22:17 +00:00
|
|
|
// d_audio->pts is the timestamp of the latest input packet with
|
|
|
|
// known pts that the decoder has decoded. d_audio->pts_bytes is
|
2013-10-29 21:38:29 +00:00
|
|
|
// the amount of bytes the decoder has written after that timestamp.
|
2013-11-23 20:22:17 +00:00
|
|
|
a_pts += d_audio->pts_offset / (double)in_format.rate;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
// Now a_pts hopefully holds the pts for end of audio from decoder.
|
|
|
|
// Subtract data in buffers between decoder and audio out.
|
|
|
|
|
|
|
|
// Decoded but not filtered
|
2013-11-23 20:22:17 +00:00
|
|
|
a_pts -= mp_audio_buffer_seconds(d_audio->decode_buffer);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-11-10 22:38:18 +00:00
|
|
|
// Data buffered in audio filters, measured in seconds of "missing" output
|
2013-11-23 20:22:17 +00:00
|
|
|
double buffered_output = af_calc_delay(d_audio->afilter);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
// Data that was ready for ao but was buffered because ao didn't fully
|
|
|
|
// accept everything to internal buffers yet
|
2013-11-10 22:38:18 +00:00
|
|
|
buffered_output += mp_audio_buffer_seconds(mpctx->ao->buffer);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
// Filters divide audio length by playback_speed, so multiply by it
|
|
|
|
// to get the length in original units without speedup or slowdown
|
2013-11-10 22:38:18 +00:00
|
|
|
a_pts -= buffered_output * mpctx->opts->playback_speed;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
return a_pts + mpctx->video_offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Return pts value corresponding to currently playing audio.
|
|
|
|
double playing_audio_pts(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
double pts = written_audio_pts(mpctx);
|
|
|
|
if (pts == MP_NOPTS_VALUE)
|
|
|
|
return pts;
|
|
|
|
return pts - mpctx->opts->playback_speed * ao_get_delay(mpctx->ao);
|
|
|
|
}
|
|
|
|
|
2013-11-10 22:38:18 +00:00
|
|
|
static int write_to_ao(struct MPContext *mpctx, struct mp_audio *data, int flags,
|
2013-10-29 21:38:29 +00:00
|
|
|
double pts)
|
|
|
|
{
|
|
|
|
if (mpctx->paused)
|
|
|
|
return 0;
|
|
|
|
struct ao *ao = mpctx->ao;
|
|
|
|
ao->pts = pts;
|
2013-11-10 22:38:18 +00:00
|
|
|
double real_samplerate = ao->samplerate / mpctx->opts->playback_speed;
|
|
|
|
int played = ao_play(mpctx->ao, data->planes, data->samples, flags);
|
|
|
|
assert(played <= data->samples);
|
2013-10-29 21:38:29 +00:00
|
|
|
if (played > 0) {
|
2013-11-10 22:38:18 +00:00
|
|
|
mpctx->shown_aframes += played;
|
|
|
|
mpctx->delay += played / real_samplerate;
|
2013-10-29 21:38:29 +00:00
|
|
|
// Keep correct pts for remaining data - could be used to flush
|
|
|
|
// remaining buffer when closing ao.
|
2013-11-10 22:38:18 +00:00
|
|
|
ao->pts += played / real_samplerate;
|
2013-10-29 21:38:29 +00:00
|
|
|
return played;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-11-10 22:38:18 +00:00
|
|
|
static int write_silence_to_ao(struct MPContext *mpctx, int samples, int flags,
|
|
|
|
double pts)
|
|
|
|
{
|
|
|
|
struct mp_audio tmp = {0};
|
|
|
|
mp_audio_buffer_get_format(mpctx->ao->buffer, &tmp);
|
|
|
|
tmp.samples = samples;
|
|
|
|
char *p = talloc_size(NULL, tmp.samples * tmp.sstride);
|
|
|
|
for (int n = 0; n < tmp.num_planes; n++)
|
|
|
|
tmp.planes[n] = p;
|
|
|
|
mp_audio_fill_silence(&tmp, 0, tmp.samples);
|
|
|
|
int r = write_to_ao(mpctx, &tmp, 0, pts);
|
|
|
|
talloc_free(p);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
#define ASYNC_PLAY_DONE -3
|
|
|
|
static int audio_start_sync(struct MPContext *mpctx, int playsize)
|
|
|
|
{
|
|
|
|
struct ao *ao = mpctx->ao;
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
2013-11-23 20:22:17 +00:00
|
|
|
struct dec_audio *d_audio = mpctx->d_audio;
|
2013-10-29 21:38:29 +00:00
|
|
|
int res;
|
|
|
|
|
2013-11-23 20:22:17 +00:00
|
|
|
assert(d_audio);
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
// Timing info may not be set without
|
2013-11-23 20:22:17 +00:00
|
|
|
res = audio_decode(d_audio, ao->buffer, 1);
|
2013-10-29 21:38:29 +00:00
|
|
|
if (res < 0)
|
|
|
|
return res;
|
|
|
|
|
2013-11-10 22:38:18 +00:00
|
|
|
int samples;
|
2013-10-29 21:38:29 +00:00
|
|
|
bool did_retry = false;
|
|
|
|
double written_pts;
|
2013-11-10 22:38:18 +00:00
|
|
|
double real_samplerate = ao->samplerate / opts->playback_speed;
|
2013-10-29 21:38:29 +00:00
|
|
|
bool hrseek = mpctx->hrseek_active; // audio only hrseek
|
|
|
|
mpctx->hrseek_active = false;
|
|
|
|
while (1) {
|
|
|
|
written_pts = written_audio_pts(mpctx);
|
|
|
|
double ptsdiff;
|
|
|
|
if (hrseek)
|
|
|
|
ptsdiff = written_pts - mpctx->hrseek_pts;
|
|
|
|
else
|
2013-11-27 19:57:08 +00:00
|
|
|
ptsdiff = written_pts - mpctx->video_next_pts - mpctx->delay
|
2013-10-29 21:38:29 +00:00
|
|
|
- mpctx->audio_delay;
|
2013-11-10 22:38:18 +00:00
|
|
|
samples = ptsdiff * real_samplerate;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
// ogg demuxers give packets without timing
|
2013-11-23 20:22:17 +00:00
|
|
|
if (written_pts <= 1 && d_audio->pts == MP_NOPTS_VALUE) {
|
2013-10-29 21:38:29 +00:00
|
|
|
if (!did_retry) {
|
|
|
|
// Try to read more data to see packets that have pts
|
2013-11-23 20:22:17 +00:00
|
|
|
res = audio_decode(d_audio, ao->buffer, ao->samplerate);
|
2013-10-29 21:38:29 +00:00
|
|
|
if (res < 0)
|
|
|
|
return res;
|
|
|
|
did_retry = true;
|
|
|
|
continue;
|
|
|
|
}
|
2013-11-10 22:38:18 +00:00
|
|
|
samples = 0;
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (fabs(ptsdiff) > 300 || isnan(ptsdiff)) // pts reset or just broken?
|
2013-11-10 22:38:18 +00:00
|
|
|
samples = 0;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-11-10 22:38:18 +00:00
|
|
|
if (samples > 0)
|
2013-10-29 21:38:29 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
mpctx->syncing_audio = false;
|
2013-11-10 22:38:18 +00:00
|
|
|
int skip_samples = -samples;
|
|
|
|
int a = MPMIN(skip_samples, MPMAX(playsize, 2500));
|
2013-11-23 20:22:17 +00:00
|
|
|
res = audio_decode(d_audio, ao->buffer, a);
|
2013-11-10 22:38:18 +00:00
|
|
|
if (skip_samples <= mp_audio_buffer_samples(ao->buffer)) {
|
|
|
|
mp_audio_buffer_skip(ao->buffer, skip_samples);
|
2013-10-29 21:38:29 +00:00
|
|
|
if (res < 0)
|
|
|
|
return res;
|
2013-11-23 20:22:17 +00:00
|
|
|
return audio_decode(d_audio, ao->buffer, playsize);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
2013-11-10 22:38:18 +00:00
|
|
|
mp_audio_buffer_clear(ao->buffer);
|
2013-10-29 21:38:29 +00:00
|
|
|
if (res < 0)
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
if (hrseek)
|
|
|
|
// Don't add silence in audio-only case even if position is too late
|
|
|
|
return 0;
|
2013-11-10 22:38:18 +00:00
|
|
|
if (samples >= playsize) {
|
2013-10-29 21:38:29 +00:00
|
|
|
/* This case could fall back to the one below with
|
2013-11-10 22:38:18 +00:00
|
|
|
* samples = playsize, but then silence would keep accumulating
|
|
|
|
* in ao->buffer if the AO accepts less data than it asks for
|
2013-10-29 21:38:29 +00:00
|
|
|
* in playsize. */
|
2013-11-10 22:38:18 +00:00
|
|
|
write_silence_to_ao(mpctx, playsize, 0,
|
|
|
|
written_pts - samples / real_samplerate);
|
2013-10-29 21:38:29 +00:00
|
|
|
return ASYNC_PLAY_DONE;
|
|
|
|
}
|
|
|
|
mpctx->syncing_audio = false;
|
2013-11-10 22:38:18 +00:00
|
|
|
mp_audio_buffer_prepend_silence(ao->buffer, samples);
|
2013-11-23 20:22:17 +00:00
|
|
|
return audio_decode(d_audio, ao->buffer, playsize);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int fill_audio_out_buffers(struct MPContext *mpctx, double endpts)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
struct ao *ao = mpctx->ao;
|
|
|
|
int playsize;
|
|
|
|
int playflags = 0;
|
|
|
|
bool audio_eof = false;
|
audio: don't let ao_lavc access frontend internals, change gapless audio
ao_lavc.c accesses ao->buffer, which I consider internal. The access was
done in ao_lavc.c/uninit(), which tried to get the left-over audio in
order to write the last (possibly partial) audio frame. The play()
function didn't accept partial frames, because the AOPLAY_FINAL_CHUNK
flag was not correctly set, and handling it otherwise would require an
internal FIFO.
Fix this by making sure that with gapless audio (used with encoding),
the AOPLAY_FINAL_CHUNK is set only once, instead when each file ends.
Basically, move the hack in ao_lavc's uninit to uninit_player.
One thing can not be entirely correctly handled: if gapless audio is
active, we don't know really whether the AO is closed because the file
ended playing (i.e. we want to send the buffered remainder of the audio
to the AO), or whether the user is quitting the player. (The stop_play
flag is overwritten, fixing that is perhaps not worth it.) Handle this
by adding additional code to drain the AO and the buffers when playback
is quit (see play_current_file() change).
Test case: mpv avdevice://lavfi:sine=441 avdevice://lavfi:sine=441 -length 0.2267 -gapless-audio
2013-11-08 19:00:58 +00:00
|
|
|
bool signal_eof = false;
|
2013-10-29 21:38:29 +00:00
|
|
|
bool partial_fill = false;
|
2013-11-23 20:22:17 +00:00
|
|
|
struct dec_audio *d_audio = mpctx->d_audio;
|
audio: respect --end/--length with spdif passthrough
In theory, we can't really do this, because we don't know when a spdif
frame ends. Spdif transports compressed audio through audio setups that
were originally designed for PCM only (which includes the audio filter
chain, the AO API, most audio output APIs, etc.), and to reach this
goal, spdif pretends to be PCM. Compressed data frames are padded with
zeros, until a certain data rate is reached, which corresponds to a
pseudo-PCM format with 2 bytes per sample and 2 channels at 48000 Hz.
Of course an actual spdif frame is significantly larger than a frame
of the PCM format it pretends to be, so cutting audio data on frame
boundaries (as according to the pseudo-PCM format) merely yields an
incomplete and broken frame, not audio that plays for the desired
duration.
However, sending an incomplete frame might still be much better than the
current behavior, which simply ignores --end/--length (but still lets
the video end at the exact end time).
Should this result in trouble with real spdif receivers, this commit
probably has to be reverted.
2013-11-23 20:42:31 +00:00
|
|
|
// Can't adjust the start of audio with spdif pass-through.
|
2013-10-29 21:38:29 +00:00
|
|
|
bool modifiable_audio_format = !(ao->format & AF_FORMAT_SPECIAL_MASK);
|
|
|
|
|
2013-11-23 20:22:17 +00:00
|
|
|
assert(d_audio);
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
if (mpctx->paused)
|
|
|
|
playsize = 1; // just initialize things (audio pts at least)
|
|
|
|
else
|
|
|
|
playsize = ao_get_space(ao);
|
|
|
|
|
|
|
|
// Coming here with hrseek_active still set means audio-only
|
2013-11-23 20:36:20 +00:00
|
|
|
if (!mpctx->d_video || !mpctx->sync_audio_to_video)
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->syncing_audio = false;
|
|
|
|
if (!opts->initial_audio_sync || !modifiable_audio_format) {
|
|
|
|
mpctx->syncing_audio = false;
|
|
|
|
mpctx->hrseek_active = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
int res;
|
|
|
|
if (mpctx->syncing_audio || mpctx->hrseek_active)
|
|
|
|
res = audio_start_sync(mpctx, playsize);
|
|
|
|
else
|
2013-11-23 20:22:17 +00:00
|
|
|
res = audio_decode(d_audio, ao->buffer, playsize);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
if (res < 0) { // EOF, error or format change
|
|
|
|
if (res == -2) {
|
|
|
|
/* The format change isn't handled too gracefully. A more precise
|
|
|
|
* implementation would require draining buffered old-format audio
|
|
|
|
* while displaying video, then doing the output format switch.
|
|
|
|
*/
|
|
|
|
if (!mpctx->opts->gapless_audio)
|
|
|
|
uninit_player(mpctx, INITIALIZED_AO);
|
|
|
|
reinit_audio_chain(mpctx);
|
|
|
|
return -1;
|
|
|
|
} else if (res == ASYNC_PLAY_DONE)
|
|
|
|
return 0;
|
2013-11-23 20:22:17 +00:00
|
|
|
else if (demux_stream_eof(d_audio->header))
|
2013-10-29 21:38:29 +00:00
|
|
|
audio_eof = true;
|
|
|
|
}
|
|
|
|
|
audio: respect --end/--length with spdif passthrough
In theory, we can't really do this, because we don't know when a spdif
frame ends. Spdif transports compressed audio through audio setups that
were originally designed for PCM only (which includes the audio filter
chain, the AO API, most audio output APIs, etc.), and to reach this
goal, spdif pretends to be PCM. Compressed data frames are padded with
zeros, until a certain data rate is reached, which corresponds to a
pseudo-PCM format with 2 bytes per sample and 2 channels at 48000 Hz.
Of course an actual spdif frame is significantly larger than a frame
of the PCM format it pretends to be, so cutting audio data on frame
boundaries (as according to the pseudo-PCM format) merely yields an
incomplete and broken frame, not audio that plays for the desired
duration.
However, sending an incomplete frame might still be much better than the
current behavior, which simply ignores --end/--length (but still lets
the video end at the exact end time).
Should this result in trouble with real spdif receivers, this commit
probably has to be reverted.
2013-11-23 20:42:31 +00:00
|
|
|
if (endpts != MP_NOPTS_VALUE) {
|
2013-11-10 22:38:18 +00:00
|
|
|
double samples = (endpts - written_audio_pts(mpctx) + mpctx->audio_delay)
|
|
|
|
* ao->samplerate / opts->playback_speed;
|
|
|
|
if (playsize > samples) {
|
|
|
|
playsize = MPMAX(samples, 0);
|
2013-10-29 21:38:29 +00:00
|
|
|
audio_eof = true;
|
|
|
|
partial_fill = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-10 22:38:18 +00:00
|
|
|
if (playsize > mp_audio_buffer_samples(ao->buffer)) {
|
|
|
|
playsize = mp_audio_buffer_samples(ao->buffer);
|
2013-10-29 21:38:29 +00:00
|
|
|
partial_fill = true;
|
|
|
|
}
|
|
|
|
if (!playsize)
|
|
|
|
return partial_fill && audio_eof ? -2 : -partial_fill;
|
|
|
|
|
audio: don't let ao_lavc access frontend internals, change gapless audio
ao_lavc.c accesses ao->buffer, which I consider internal. The access was
done in ao_lavc.c/uninit(), which tried to get the left-over audio in
order to write the last (possibly partial) audio frame. The play()
function didn't accept partial frames, because the AOPLAY_FINAL_CHUNK
flag was not correctly set, and handling it otherwise would require an
internal FIFO.
Fix this by making sure that with gapless audio (used with encoding),
the AOPLAY_FINAL_CHUNK is set only once, instead when each file ends.
Basically, move the hack in ao_lavc's uninit to uninit_player.
One thing can not be entirely correctly handled: if gapless audio is
active, we don't know really whether the AO is closed because the file
ended playing (i.e. we want to send the buffered remainder of the audio
to the AO), or whether the user is quitting the player. (The stop_play
flag is overwritten, fixing that is perhaps not worth it.) Handle this
by adding additional code to drain the AO and the buffers when playback
is quit (see play_current_file() change).
Test case: mpv avdevice://lavfi:sine=441 avdevice://lavfi:sine=441 -length 0.2267 -gapless-audio
2013-11-08 19:00:58 +00:00
|
|
|
if (audio_eof && partial_fill) {
|
|
|
|
if (opts->gapless_audio) {
|
|
|
|
// With gapless audio, delay this to ao_uninit. There must be only
|
|
|
|
// 1 final chunk, and that is handled when calling ao_uninit().
|
|
|
|
signal_eof = true;
|
|
|
|
} else {
|
|
|
|
playflags |= AOPLAY_FINAL_CHUNK;
|
|
|
|
}
|
|
|
|
}
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-11-10 22:38:18 +00:00
|
|
|
assert(ao->buffer_playable_samples <= mp_audio_buffer_samples(ao->buffer));
|
|
|
|
|
|
|
|
struct mp_audio data;
|
|
|
|
mp_audio_buffer_peek(ao->buffer, &data);
|
|
|
|
data.samples = MPMIN(data.samples, playsize);
|
|
|
|
int played = write_to_ao(mpctx, &data, playflags, written_audio_pts(mpctx));
|
|
|
|
ao->buffer_playable_samples = playsize - played;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
if (played > 0) {
|
2013-11-10 22:38:18 +00:00
|
|
|
mp_audio_buffer_skip(ao->buffer, played);
|
2013-10-29 21:38:29 +00:00
|
|
|
} else if (!mpctx->paused && audio_eof && ao_get_delay(ao) < .04) {
|
|
|
|
// Sanity check to avoid hanging in case current ao doesn't output
|
|
|
|
// partial chunks and doesn't check for AOPLAY_FINAL_CHUNK
|
audio: don't let ao_lavc access frontend internals, change gapless audio
ao_lavc.c accesses ao->buffer, which I consider internal. The access was
done in ao_lavc.c/uninit(), which tried to get the left-over audio in
order to write the last (possibly partial) audio frame. The play()
function didn't accept partial frames, because the AOPLAY_FINAL_CHUNK
flag was not correctly set, and handling it otherwise would require an
internal FIFO.
Fix this by making sure that with gapless audio (used with encoding),
the AOPLAY_FINAL_CHUNK is set only once, instead when each file ends.
Basically, move the hack in ao_lavc's uninit to uninit_player.
One thing can not be entirely correctly handled: if gapless audio is
active, we don't know really whether the AO is closed because the file
ended playing (i.e. we want to send the buffered remainder of the audio
to the AO), or whether the user is quitting the player. (The stop_play
flag is overwritten, fixing that is perhaps not worth it.) Handle this
by adding additional code to drain the AO and the buffers when playback
is quit (see play_current_file() change).
Test case: mpv avdevice://lavfi:sine=441 avdevice://lavfi:sine=441 -length 0.2267 -gapless-audio
2013-11-08 19:00:58 +00:00
|
|
|
signal_eof = true;
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
audio: don't let ao_lavc access frontend internals, change gapless audio
ao_lavc.c accesses ao->buffer, which I consider internal. The access was
done in ao_lavc.c/uninit(), which tried to get the left-over audio in
order to write the last (possibly partial) audio frame. The play()
function didn't accept partial frames, because the AOPLAY_FINAL_CHUNK
flag was not correctly set, and handling it otherwise would require an
internal FIFO.
Fix this by making sure that with gapless audio (used with encoding),
the AOPLAY_FINAL_CHUNK is set only once, instead when each file ends.
Basically, move the hack in ao_lavc's uninit to uninit_player.
One thing can not be entirely correctly handled: if gapless audio is
active, we don't know really whether the AO is closed because the file
ended playing (i.e. we want to send the buffered remainder of the audio
to the AO), or whether the user is quitting the player. (The stop_play
flag is overwritten, fixing that is perhaps not worth it.) Handle this
by adding additional code to drain the AO and the buffers when playback
is quit (see play_current_file() change).
Test case: mpv avdevice://lavfi:sine=441 avdevice://lavfi:sine=441 -length 0.2267 -gapless-audio
2013-11-08 19:00:58 +00:00
|
|
|
return signal_eof ? -2 : -partial_fill;
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
2013-11-08 19:02:09 +00:00
|
|
|
|
|
|
|
// Drop data queued for output, or which the AO is currently outputting.
|
|
|
|
void clear_audio_output_buffers(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
if (mpctx->ao) {
|
|
|
|
ao_reset(mpctx->ao);
|
2013-11-10 22:38:18 +00:00
|
|
|
mp_audio_buffer_clear(mpctx->ao->buffer);
|
|
|
|
mpctx->ao->buffer_playable_samples = 0;
|
2013-11-08 19:02:09 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Drop decoded data queued for filtering.
|
|
|
|
void clear_audio_decode_buffers(struct MPContext *mpctx)
|
|
|
|
{
|
2013-11-23 20:22:17 +00:00
|
|
|
if (mpctx->d_audio)
|
|
|
|
mp_audio_buffer_clear(mpctx->d_audio->decode_buffer);
|
2013-11-08 19:02:09 +00:00
|
|
|
}
|