From 0366ba253159a551127a7d1817a4a000e078d322 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 26 Jan 2018 04:36:47 +0100 Subject: player: replace old lavfi wrapper with new filter code lavfi.c is not necessary anymore, because f_lavfi.c (which was actually converted from it) can be used now. --- player/core.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'player/core.h') diff --git a/player/core.h b/player/core.h index a4cffa5d09..0560393bd3 100644 --- a/player/core.h +++ b/player/core.h @@ -34,8 +34,6 @@ #include "video/mp_image.h" #include "video/out/vo.h" -#include "lavfi.h" - // definitions used internally by the core player code enum stop_play_reason { @@ -161,7 +159,8 @@ struct track { // Where the decoded result goes to (one of them is not NULL if active) struct vo_chain *vo_c; struct ao_chain *ao_c; - struct lavfi_pad *sink; + struct mp_pin *sink; + bool sink_eof; // whether it got passed EOF // For stream recording (remuxing mode). struct mp_recorder_sink *remux_sink; @@ -183,7 +182,8 @@ struct vo_chain { struct mp_image *input_mpi; struct track *track; - struct lavfi_pad *filter_src; + struct mp_pin *filter_src; + bool filter_src_got_eof; // whether this returned EOF last time struct dec_video *video_src; // - video consists of a single picture, which should be shown only once @@ -216,7 +216,8 @@ struct ao_chain { double last_out_pts; struct track *track; - struct lavfi_pad *filter_src; + struct mp_pin *filter_src; + bool filter_src_got_eof; // whether this returned EOF last time struct dec_audio *audio_src; }; @@ -315,10 +316,11 @@ typedef struct MPContext { // Currently, this is used for the secondary subtitle track only. struct track *current_track[NUM_PTRACKS][STREAM_TYPE_COUNT]; - struct lavfi *lavfi; - struct mp_filter *filter_root; + struct mp_filter *lavfi; + char *lavfi_graph; + struct ao *ao; struct mp_aframe *ao_filter_fmt; // for weak gapless audio check struct ao_chain *ao_chain; -- cgit v1.2.3