From f27a9aaa17eaced765718d096d0b3284c3f15b1f Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 31 Oct 2017 15:29:13 +0100 Subject: vd_lavc: remove more dead legacy code All of this was dead code and completely unused. get_buffer2_hwdec() is the biggest chunk. One unfortunate thing about it is that, while it was active, it could perform a software fallback much faster, because it didn't have to wait until a full frame is decoded (it actually decoded a full frame, but the current code has to decode many more frames due to the codec delay, because the current code waits until the API returns a decoded frame.) We should probably restore the latter, although since it's an optional optimization, and the current behavior doesn't change with the removal of this code, don't actually do anything about it. --- video/decode/hw_dxva2.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'video/decode/hw_dxva2.c') diff --git a/video/decode/hw_dxva2.c b/video/decode/hw_dxva2.c index d2fe5d6c15..ebfa12d1e1 100644 --- a/video/decode/hw_dxva2.c +++ b/video/decode/hw_dxva2.c @@ -171,14 +171,7 @@ const struct vd_lavc_hwdec mp_vd_lavc_dxva2 = { .image_format = IMGFMT_DXVA2, .generic_hwaccel = true, .set_hwframes = true, - .static_pool = true, .hwframes_refine = d3d_hwframes_refine, - .pixfmt_map = (const enum AVPixelFormat[][2]) { - {AV_PIX_FMT_YUV420P10, AV_PIX_FMT_P010}, - {AV_PIX_FMT_YUV420P, AV_PIX_FMT_NV12}, - {AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NV12}, - {AV_PIX_FMT_NONE} - }, }; const struct vd_lavc_hwdec mp_vd_lavc_dxva2_copy = { @@ -188,13 +181,6 @@ const struct vd_lavc_hwdec mp_vd_lavc_dxva2_copy = { .generic_hwaccel = true, .create_dev = d3d9_create_dev, .set_hwframes = true, - .static_pool = true, .hwframes_refine = d3d_hwframes_refine, - .pixfmt_map = (const enum AVPixelFormat[][2]) { - {AV_PIX_FMT_YUV420P10, AV_PIX_FMT_P010}, - {AV_PIX_FMT_YUV420P, AV_PIX_FMT_NV12}, - {AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_NV12}, - {AV_PIX_FMT_NONE} - }, .delay_queue = HWDEC_DELAY_QUEUE_COUNT, }; -- cgit v1.2.3