From eb9d2039460e413fe2f4f191ad0ddafde3be27df Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 1 May 2014 23:53:18 +0200 Subject: video: change everything Change how the video decoding loop works. The structure should now be a bit easier to follow. The interactions on format changes are (probably) simpler. This also aligns the decoding loop with future planned changes, such as moving various things to separate threads. --- video/decode/dec_video.c | 2 -- video/decode/dec_video.h | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'video/decode') diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index b59ded7ac3..f092e82a2e 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -436,8 +436,6 @@ int video_reconfig_filters(struct dec_video *d_video, return -1; } - d_video->vf_input = *params; - return 0; } diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h index 7805d89c48..58ec99a86b 100644 --- a/video/decode/dec_video.h +++ b/video/decode/dec_video.h @@ -40,11 +40,9 @@ struct dec_video { char *decoder_desc; - struct mp_image_params decoder_output; // last output of the decoder - struct mp_image_params vf_input; // video filter input params - - // Used temporarily during format changes + // Used temporarily during decoding (important for format changes) struct mp_image *waiting_decoded_mpi; + struct mp_image_params decoder_output; // last output of the decoder void *priv; // for free use by vd_driver -- cgit v1.2.3