Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
c46db38c
Commit
c46db38c
authored
Mar 31, 2016
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hwcontext: add a dxva2 implementation
parent
d338abb6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
84 additions
and
1 deletion
+84
-1
APIchanges
doc/APIchanges
+3
-0
Makefile
libavutil/Makefile
+3
-0
hwcontext.c
libavutil/hwcontext.c
+3
-0
hwcontext.h
libavutil/hwcontext.h
+1
-0
hwcontext_dxva2.c
libavutil/hwcontext_dxva2.c
+0
-0
hwcontext_dxva2.h
libavutil/hwcontext_dxva2.h
+72
-0
hwcontext_internal.h
libavutil/hwcontext_internal.h
+1
-0
version.h
libavutil/version.h
+1
-1
No files found.
doc/APIchanges
View file @
c46db38c
...
...
@@ -13,6 +13,9 @@ libavutil: 2015-08-28
API changes, most recent first:
2016-xx-xx - xxxxxxx - lavu 55.11.0 - hwcontext_dxva2.h
Add new installed header with DXVA2-specific hwcontext definitions.
2016-xx-xx - xxxxxxx - lavu 55.10.0 - opt.h
Add av_opt_copy().
...
...
libavutil/Makefile
View file @
c46db38c
...
...
@@ -26,6 +26,7 @@ HEADERS = adler32.h \
hmac.h
\
hwcontext.h
\
hwcontext_cuda.h
\
hwcontext_dxva2.h
\
hwcontext_vaapi.h
\
hwcontext_vdpau.h
\
imgutils.h
\
...
...
@@ -108,6 +109,7 @@ OBJS = adler32.o \
xtea.o
\
OBJS-$(CONFIG_CUDA)
+=
hwcontext_cuda.o
OBJS-$(CONFIG_DXVA2)
+=
hwcontext_dxva2.o
OBJS-$(CONFIG_LZO)
+=
lzo.o
OBJS-$(CONFIG_VAAPI)
+=
hwcontext_vaapi.o
OBJS-$(CONFIG_VDPAU)
+=
hwcontext_vdpau.o
...
...
@@ -115,6 +117,7 @@ OBJS-$(CONFIG_VDPAU) += hwcontext_vdpau.o
OBJS
+=
$
(
COMPAT_OBJS:%
=
../compat/%
)
SKIPHEADERS-$(CONFIG_CUDA)
+=
hwcontext_cuda.h
SKIPHEADERS-$(CONFIG_DXVA2)
+=
hwcontext_dxva2.h
SKIPHEADERS-$(CONFIG_VAAPI)
+=
hwcontext_vaapi.h
SKIPHEADERS-$(CONFIG_VDPAU)
+=
hwcontext_vdpau.h
SKIPHEADERS-$(HAVE_ATOMICS_GCC)
+=
atomic_gcc.h
...
...
libavutil/hwcontext.c
View file @
c46db38c
...
...
@@ -32,6 +32,9 @@ static const HWContextType *hw_table[] = {
#if CONFIG_CUDA
&
ff_hwcontext_type_cuda
,
#endif
#if CONFIG_DXVA2
&
ff_hwcontext_type_dxva2
,
#endif
#if CONFIG_VAAPI
&
ff_hwcontext_type_vaapi
,
#endif
...
...
libavutil/hwcontext.h
View file @
c46db38c
...
...
@@ -28,6 +28,7 @@ enum AVHWDeviceType {
AV_HWDEVICE_TYPE_VDPAU
,
AV_HWDEVICE_TYPE_CUDA
,
AV_HWDEVICE_TYPE_VAAPI
,
AV_HWDEVICE_TYPE_DXVA2
,
};
typedef
struct
AVHWDeviceInternal
AVHWDeviceInternal
;
...
...
libavutil/hwcontext_dxva2.c
0 → 100644
View file @
c46db38c
This diff is collapsed.
Click to expand it.
libavutil/hwcontext_dxva2.h
0 → 100644
View file @
c46db38c
/*
* This file is part of Libav.
*
* Libav 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.
*
* Libav 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 GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVUTIL_HWCONTEXT_DXVA2_H
#define AVUTIL_HWCONTEXT_DXVA2_H
/**
* @file
* An API-specific header for AV_HWDEVICE_TYPE_DXVA2.
*
* Only fixed-size pools are supported.
*
* For user-allocated pools, AVHWFramesContext.pool must return AVBufferRefs
* with the data pointer set to a pointer to IDirect3DSurface9.
*/
#include <d3d9.h>
#include <dxva2api.h>
/**
* This struct is allocated as AVHWDeviceContext.hwctx
*/
typedef
struct
AVDXVA2DeviceContext
{
IDirect3DDeviceManager9
*
devmgr
;
}
AVDXVA2DeviceContext
;
/**
* This struct is allocated as AVHWFramesContext.hwctx
*/
typedef
struct
AVDXVA2FramesContext
{
/**
* The surface type (e.g. DXVA2_VideoProcessorRenderTarget or
* DXVA2_VideoDecoderRenderTarget). Must be set by the caller.
*/
DWORD
surface_type
;
/**
* The surface pool. When an external pool is not provided by the caller,
* this will be managed (allocated and filled on init, freed on uninit) by
* libavutil.
*/
IDirect3DSurface9
**
surfaces
;
int
nb_surfaces
;
/**
* Certain drivers require the decoder to be destroyed before the surfaces.
* To allow internally managed pools to work properly in such cases, this
* field is provided.
*
* If it is non-NULL, libavutil will call IDirectXVideoDecoder_Release() on
* it just before the internal surface pool is freed.
*/
IDirectXVideoDecoder
*
decoder_to_release
;
}
AVDXVA2FramesContext
;
#endif
/* AVUTIL_HWCONTEXT_DXVA2_H */
libavutil/hwcontext_internal.h
View file @
c46db38c
...
...
@@ -97,6 +97,7 @@ struct AVHWFramesInternal {
};
extern
const
HWContextType
ff_hwcontext_type_cuda
;
extern
const
HWContextType
ff_hwcontext_type_dxva2
;
extern
const
HWContextType
ff_hwcontext_type_vaapi
;
extern
const
HWContextType
ff_hwcontext_type_vdpau
;
...
...
libavutil/version.h
View file @
c46db38c
...
...
@@ -54,7 +54,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 55
#define LIBAVUTIL_VERSION_MINOR 1
0
#define LIBAVUTIL_VERSION_MINOR 1
1
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment