RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
mpv/video/dxva2.c

90 lines
2.6 KiB
C
Raw Normal View History

dxva2: use mp_image pool for d3d surfaces This is required so that the individual surfaces can pass beyond the dxva2 decoder and be passed to the vo. This also adds additional data to mp_image->planes[0] for IMGFMT_DXVA2, which is required for maintaining and releasing the surface even if the decoder code is uninited. The IDirectXVideoDecoder itself is encapsulated together with its surface pool and configuration in a dxva2_decoder structure whose creation and destruction is managed by talloc.
2016-02-08 04:29:14 +00:00
/*
* This file is part of mpv.
*
dxva2: fix license on some newly added files to lgpl v2.1+ I mistakenly copied the wrong license text into these files when I created them. Since I'm the only one to have touched these files, it should be OK to change them.
2016-02-16 00:16:03 +00:00
* mpv is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
dxva2: use mp_image pool for d3d surfaces This is required so that the individual surfaces can pass beyond the dxva2 decoder and be passed to the vo. This also adds additional data to mp_image->planes[0] for IMGFMT_DXVA2, which is required for maintaining and releasing the surface even if the decoder code is uninited. The IDirectXVideoDecoder itself is encapsulated together with its surface pool and configuration in a dxva2_decoder structure whose creation and destruction is managed by talloc.
2016-02-08 04:29:14 +00:00
*
* mpv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dxva2: fix license on some newly added files to lgpl v2.1+ I mistakenly copied the wrong license text into these files when I created them. Since I'm the only one to have touched these files, it should be OK to change them.
2016-02-16 00:16:03 +00:00
* GNU Lesser General Public License for more details.
dxva2: use mp_image pool for d3d surfaces This is required so that the individual surfaces can pass beyond the dxva2 decoder and be passed to the vo. This also adds additional data to mp_image->planes[0] for IMGFMT_DXVA2, which is required for maintaining and releasing the surface even if the decoder code is uninited. The IDirectXVideoDecoder itself is encapsulated together with its surface pool and configuration in a dxva2_decoder structure whose creation and destruction is managed by talloc.
2016-02-08 04:29:14 +00:00
*
dxva2: fix license on some newly added files to lgpl v2.1+ I mistakenly copied the wrong license text into these files when I created them. Since I'm the only one to have touched these files, it should be OK to change them.
2016-02-16 00:16:03 +00:00
* You should have received a copy of the GNU Lesser General Public
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
dxva2: use mp_image pool for d3d surfaces This is required so that the individual surfaces can pass beyond the dxva2 decoder and be passed to the vo. This also adds additional data to mp_image->planes[0] for IMGFMT_DXVA2, which is required for maintaining and releasing the surface even if the decoder code is uninited. The IDirectXVideoDecoder itself is encapsulated together with its surface pool and configuration in a dxva2_decoder structure whose creation and destruction is managed by talloc.
2016-02-08 04:29:14 +00:00
*/
#include <assert.h>
#include "common/av_common.h"
#include "dxva2.h"
#include "mp_image.h"
#include "img_format.h"
#include "mp_image_pool.h"
struct dxva2_surface {
HMODULE d3dlib;
HMODULE dxva2lib;
IDirectXVideoDecoder *decoder;
LPDIRECT3DSURFACE9 surface;
};
LPDIRECT3DSURFACE9 d3d9_surface_in_mp_image(struct mp_image *mpi)
{
return mpi && mpi->imgfmt == IMGFMT_DXVA2 ?
(LPDIRECT3DSURFACE9)mpi->planes[3] : NULL;
}
dxva2: another attempt at using mp_image pool Apparently, some drivers require you to allocate all of the decoder d3d surfaces at once. This commit changes the strategy from allocating surfaces as needed via mp_image_pool_set_allocator, to allocating all the surfaces in one call to IDirectXVideoDecoderService_CreateSurface and adding them to the pool with mp_image_pool_add. fixes #2822
2016-02-15 19:15:17 +00:00
static void dxva2_release_img(void *arg)
dxva2: use mp_image pool for d3d surfaces This is required so that the individual surfaces can pass beyond the dxva2 decoder and be passed to the vo. This also adds additional data to mp_image->planes[0] for IMGFMT_DXVA2, which is required for maintaining and releasing the surface even if the decoder code is uninited. The IDirectXVideoDecoder itself is encapsulated together with its surface pool and configuration in a dxva2_decoder structure whose creation and destruction is managed by talloc.
2016-02-08 04:29:14 +00:00
{
struct dxva2_surface *surface = arg;
if (surface->surface)
IDirect3DSurface9_Release(surface->surface);
if (surface->decoder)
IDirectXVideoDecoder_Release(surface->decoder);
if (surface->dxva2lib)
FreeLibrary(surface->dxva2lib);
if (surface->d3dlib)
FreeLibrary(surface->d3dlib);
talloc_free(surface);
}
dxva2: another attempt at using mp_image pool Apparently, some drivers require you to allocate all of the decoder d3d surfaces at once. This commit changes the strategy from allocating surfaces as needed via mp_image_pool_set_allocator, to allocating all the surfaces in one call to IDirectXVideoDecoderService_CreateSurface and adding them to the pool with mp_image_pool_add. fixes #2822
2016-02-15 19:15:17 +00:00
struct mp_image *dxva2_new_ref(IDirectXVideoDecoder *decoder,
LPDIRECT3DSURFACE9 d3d9_surface, int w, int h)
dxva2: use mp_image pool for d3d surfaces This is required so that the individual surfaces can pass beyond the dxva2 decoder and be passed to the vo. This also adds additional data to mp_image->planes[0] for IMGFMT_DXVA2, which is required for maintaining and releasing the surface even if the decoder code is uninited. The IDirectXVideoDecoder itself is encapsulated together with its surface pool and configuration in a dxva2_decoder structure whose creation and destruction is managed by talloc.
2016-02-08 04:29:14 +00:00
{
dxva2: another attempt at using mp_image pool Apparently, some drivers require you to allocate all of the decoder d3d surfaces at once. This commit changes the strategy from allocating surfaces as needed via mp_image_pool_set_allocator, to allocating all the surfaces in one call to IDirectXVideoDecoderService_CreateSurface and adding them to the pool with mp_image_pool_add. fixes #2822
2016-02-15 19:15:17 +00:00
if (!decoder || !d3d9_surface)
dxva2: use mp_image pool for d3d surfaces This is required so that the individual surfaces can pass beyond the dxva2 decoder and be passed to the vo. This also adds additional data to mp_image->planes[0] for IMGFMT_DXVA2, which is required for maintaining and releasing the surface even if the decoder code is uninited. The IDirectXVideoDecoder itself is encapsulated together with its surface pool and configuration in a dxva2_decoder structure whose creation and destruction is managed by talloc.
2016-02-08 04:29:14 +00:00
return NULL;
struct dxva2_surface *surface = talloc_zero(NULL, struct dxva2_surface);
// Add additional references to the libraries which might otherwise be freed
// before the surface, which is observed to lead to bad behaviour
surface->d3dlib = LoadLibrary(L"d3d9.dll");
surface->dxva2lib = LoadLibrary(L"dxva2.dll");
if (!surface->d3dlib || !surface->dxva2lib)
goto fail;
dxva2: another attempt at using mp_image pool Apparently, some drivers require you to allocate all of the decoder d3d surfaces at once. This commit changes the strategy from allocating surfaces as needed via mp_image_pool_set_allocator, to allocating all the surfaces in one call to IDirectXVideoDecoderService_CreateSurface and adding them to the pool with mp_image_pool_add. fixes #2822
2016-02-15 19:15:17 +00:00
surface->surface = d3d9_surface;
IDirect3DSurface9_AddRef(surface->surface);
surface->decoder = decoder;
IDirectXVideoDecoder_AddRef(surface->decoder);
dxva2: use mp_image pool for d3d surfaces This is required so that the individual surfaces can pass beyond the dxva2 decoder and be passed to the vo. This also adds additional data to mp_image->planes[0] for IMGFMT_DXVA2, which is required for maintaining and releasing the surface even if the decoder code is uninited. The IDirectXVideoDecoder itself is encapsulated together with its surface pool and configuration in a dxva2_decoder structure whose creation and destruction is managed by talloc.
2016-02-08 04:29:14 +00:00
dxva2: check for failure of mp_image_new_custom_ref previously, this may have caused a leak
2016-02-16 00:23:27 +00:00
struct mp_image *mpi = mp_image_new_custom_ref(&(struct mp_image){0},
surface, dxva2_release_img);
if (!mpi)
goto fail;
dxva2: use mp_image pool for d3d surfaces This is required so that the individual surfaces can pass beyond the dxva2 decoder and be passed to the vo. This also adds additional data to mp_image->planes[0] for IMGFMT_DXVA2, which is required for maintaining and releasing the surface even if the decoder code is uninited. The IDirectXVideoDecoder itself is encapsulated together with its surface pool and configuration in a dxva2_decoder structure whose creation and destruction is managed by talloc.
2016-02-08 04:29:14 +00:00
dxva2: check for failure of mp_image_new_custom_ref previously, this may have caused a leak
2016-02-16 00:23:27 +00:00
mp_image_setfmt(mpi, IMGFMT_DXVA2);
mp_image_set_size(mpi, w, h);
mpi->planes[3] = (void *)surface->surface;
return mpi;
dxva2: use mp_image pool for d3d surfaces This is required so that the individual surfaces can pass beyond the dxva2 decoder and be passed to the vo. This also adds additional data to mp_image->planes[0] for IMGFMT_DXVA2, which is required for maintaining and releasing the surface even if the decoder code is uninited. The IDirectXVideoDecoder itself is encapsulated together with its surface pool and configuration in a dxva2_decoder structure whose creation and destruction is managed by talloc.
2016-02-08 04:29:14 +00:00
fail:
dxva2: another attempt at using mp_image pool Apparently, some drivers require you to allocate all of the decoder d3d surfaces at once. This commit changes the strategy from allocating surfaces as needed via mp_image_pool_set_allocator, to allocating all the surfaces in one call to IDirectXVideoDecoderService_CreateSurface and adding them to the pool with mp_image_pool_add. fixes #2822
2016-02-15 19:15:17 +00:00
dxva2_release_img(surface);
dxva2: use mp_image pool for d3d surfaces This is required so that the individual surfaces can pass beyond the dxva2 decoder and be passed to the vo. This also adds additional data to mp_image->planes[0] for IMGFMT_DXVA2, which is required for maintaining and releasing the surface even if the decoder code is uninited. The IDirectXVideoDecoder itself is encapsulated together with its surface pool and configuration in a dxva2_decoder structure whose creation and destruction is managed by talloc.
2016-02-08 04:29:14 +00:00
return NULL;
}