summaryrefslogtreecommitdiffstats
path: root/player/core.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-01-18 14:44:20 +0100
committerKevin Mitchell <kevmitch@gmail.com>2018-01-30 03:10:27 -0800
commitb9f804b566c4c528714e4ec5e63675ad7ba5fefd (patch)
tree49d6fcd42ce6597a67aa2af59b7f20beb21a2e14 /player/core.h
parent76276c92104c31ee936ba5c76a76072f09978c5f (diff)
downloadmpv-b9f804b566c4c528714e4ec5e63675ad7ba5fefd.tar.bz2
mpv-b9f804b566c4c528714e4ec5e63675ad7ba5fefd.tar.xz
audio: rewrite filtering glue code
Use the new filtering code for audio too.
Diffstat (limited to 'player/core.h')
-rw-r--r--player/core.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/player/core.h b/player/core.h
index c980e068fe..a4cffa5d09 100644
--- a/player/core.h
+++ b/player/core.h
@@ -201,8 +201,8 @@ struct ao_chain {
bool spdif_passthrough, spdif_failed;
bool pts_reset;
- struct af_stream *af;
- struct mp_aconverter *conv; // if af unavailable
+ struct mp_output_chain *filter;
+
struct ao *ao;
struct mp_audio_buffer *ao_buffer;
double ao_resume_time;
@@ -213,10 +213,7 @@ struct ao_chain {
// 1-element output frame queue.
struct mp_aframe *output_frame;
- // Last known input_mpi format (so af can be reinitialized any time).
- struct mp_aframe *input_format;
-
- struct mp_aframe *filter_input_format;
+ double last_out_pts;
struct track *track;
struct lavfi_pad *filter_src;
@@ -323,7 +320,7 @@ typedef struct MPContext {
struct mp_filter *filter_root;
struct ao *ao;
- struct mp_aframe *ao_decoder_fmt; // for weak gapless audio check
+ struct mp_aframe *ao_filter_fmt; // for weak gapless audio check
struct ao_chain *ao_chain;
struct vo_chain *vo_chain;