From 643a1fc7de84b234d5a4723fa0ec31f9351e770b Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 1 Dec 2017 05:29:34 +0100 Subject: vd_lavc: remove process_image callback Now unused. --- video/decode/lavc.h | 9 +++------ video/decode/vd_lavc.c | 3 --- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/video/decode/lavc.h b/video/decode/lavc.h index 70ff4cde97..caa6200121 100644 --- a/video/decode/lavc.h +++ b/video/decode/lavc.h @@ -88,18 +88,15 @@ struct vd_lavc_hwdec { int image_format; // Always returns a non-hwaccel image format. bool copying; - // Setting this will queue the given number of frames before calling - // process_image() or returning them to the renderer. This can increase - // efficiency by not blocking on the hardware pipeline by reading back - // immediately after decoding. + // Setting this will queue the given number of frames before returning them + // to the renderer. This can increase efficiency by not blocking on the + // hardware pipeline by reading back immediately after decoding. int delay_queue; int (*probe)(struct lavc_ctx *ctx, struct vd_lavc_hwdec *hwdec, const char *codec); int (*init)(struct lavc_ctx *ctx); int (*init_decoder)(struct lavc_ctx *ctx); void (*uninit)(struct lavc_ctx *ctx); - // Process the image returned by the libavcodec decoder. - struct mp_image *(*process_image)(struct lavc_ctx *ctx, struct mp_image *img); // For copy hwdecs. If probing is true, don't log errors if unavailable. // The returned device will be freed with mp_hwdec_ctx->destroy. struct mp_hwdec_ctx *(*create_dev)(struct mpv_global *global, diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 21e86b91b2..5b5a7c47fb 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -1092,9 +1092,6 @@ static bool receive_frame(struct dec_video *vd, struct mp_image **out_image) struct mp_image *res = ctx->delay_queue[0]; MP_TARRAY_REMOVE_AT(ctx->delay_queue, ctx->num_delay_queue, 0); - if (ctx->hwdec && ctx->hwdec->process_image) - res = ctx->hwdec->process_image(ctx, res); - res = res ? mp_img_swap_to_native(res) : NULL; if (!res) return progress; -- cgit v1.2.3