From 1bb726dedce9ab0cd096bd524e869cf1899697cf Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 2 Nov 2019 22:37:14 +0100 Subject: vd_lavc: simplify fallback handling for full stream hw decoder Shovel the code around to make the data flow slightly simpler (?). At least there's only one send_packet function now. The old code had the problem that send_packet() could be called even if there were queued packets; due to sending the queued packets in the receive_frame function, this should not happen anymore (the code checking for this case in send_packet should normally never be called). Untested with actual full stream hw decoders (none available here); I created a test case by making hwaccel decoding fail. --- filters/f_decoder_wrapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'filters') diff --git a/filters/f_decoder_wrapper.c b/filters/f_decoder_wrapper.c index 846a0912ed..0462bf2424 100644 --- a/filters/f_decoder_wrapper.c +++ b/filters/f_decoder_wrapper.c @@ -856,7 +856,7 @@ void lavc_process(struct mp_filter *f, struct lavc_state *state, talloc_free(pkt); mp_filter_internal_mark_progress(f); } else { - // Decoding error? Just try again. + // Decoding error, or hwdec fallback recovery. Just try again. mp_filter_internal_mark_progress(f); } } -- cgit v1.2.3