mirror of
https://github.com/mpv-player/mpv
synced 2024-12-25 08:12:17 +00:00
5059039c95
For some reason, the buffered_audio variable was used to "cache" the ao_get_delay() result. But I can't really see any reason why this should be done, and it just seems to complicate everything. One reason might be that the value should be checked only if the AO buffers have been recently filled (as otherwise the delay could go low and trigger an accidental EOF condition), but this didn't work anyway, since buffered_audio is set from ao_get_delay() anyway at a later point if it was unset. And in both cases, the value is used _after_ filling the audio buffers anyway. Simplify it. Also, move the audio EOF condition to a separate function. (Note that ao_eof_reached() probably could/should whether the last ao_play() call had AOPLAY_FINAL_CHUNK set to avoid accidental EOF on underflows, but for now let's keep the code equivalent.)
78 lines
2.6 KiB
C
78 lines
2.6 KiB
C
/*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef MPLAYER_AUDIO_OUT_H
|
|
#define MPLAYER_AUDIO_OUT_H
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include "bstr/bstr.h"
|
|
#include "common/common.h"
|
|
#include "audio/chmap.h"
|
|
#include "audio/chmap_sel.h"
|
|
|
|
enum aocontrol {
|
|
// _VOLUME commands take struct ao_control_vol pointer for input/output.
|
|
// If there's only one volume, SET should use average of left/right.
|
|
AOCONTROL_GET_VOLUME,
|
|
AOCONTROL_SET_VOLUME,
|
|
// _MUTE commands take a pointer to bool
|
|
AOCONTROL_GET_MUTE,
|
|
AOCONTROL_SET_MUTE,
|
|
// Has char* as argument, which contains the desired stream title.
|
|
AOCONTROL_UPDATE_STREAM_TITLE,
|
|
AOCONTROL_HAS_TEMP_VOLUME,
|
|
AOCONTROL_HAS_PER_APP_VOLUME,
|
|
};
|
|
|
|
// If set, then the queued audio data is the last. Note that after a while, new
|
|
// data might be written again, instead of closing the AO.
|
|
#define AOPLAY_FINAL_CHUNK 1
|
|
|
|
typedef struct ao_control_vol {
|
|
float left;
|
|
float right;
|
|
} ao_control_vol_t;
|
|
|
|
struct ao;
|
|
struct mpv_global;
|
|
struct input_ctx;
|
|
struct encode_lavc_context;
|
|
struct mp_audio;
|
|
|
|
struct ao *ao_init_best(struct mpv_global *global,
|
|
struct input_ctx *input_ctx,
|
|
struct encode_lavc_context *encode_lavc_ctx,
|
|
int samplerate, int format, struct mp_chmap channels);
|
|
void ao_uninit(struct ao *ao);
|
|
void ao_get_format(struct ao *ao, struct mp_audio *format);
|
|
const char *ao_get_name(struct ao *ao);
|
|
const char *ao_get_description(struct ao *ao);
|
|
bool ao_untimed(struct ao *ao);
|
|
int ao_play(struct ao *ao, void **data, int samples, int flags);
|
|
int ao_control(struct ao *ao, enum aocontrol cmd, void *arg);
|
|
double ao_get_delay(struct ao *ao);
|
|
int ao_get_space(struct ao *ao);
|
|
void ao_reset(struct ao *ao);
|
|
void ao_pause(struct ao *ao);
|
|
void ao_resume(struct ao *ao);
|
|
void ao_drain(struct ao *ao);
|
|
bool ao_eof_reached(struct ao *ao);
|
|
|
|
#endif /* MPLAYER_AUDIO_OUT_H */
|