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
fd0716b3
Commit
fd0716b3
authored
Jan 04, 2017
by
Steve Lhomme
Committed by
Michael Niedermayer
Jan 05, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dxva2: make ff_dxva2_get_surface() static and rename it
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
4068f5fa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
dxva2.c
libavcodec/dxva2.c
+4
-4
dxva2_internal.h
libavcodec/dxva2_internal.h
+0
-2
No files found.
libavcodec/dxva2.c
View file @
fd0716b3
...
...
@@ -29,7 +29,7 @@
#include "avcodec.h"
#include "dxva2_internal.h"
void
*
ff_dxva2_
get_surface
(
const
AVFrame
*
frame
)
static
void
*
get_surface
(
const
AVFrame
*
frame
)
{
return
frame
->
data
[
3
];
}
...
...
@@ -38,7 +38,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx,
const
AVDXVAContext
*
ctx
,
const
AVFrame
*
frame
)
{
void
*
surface
=
ff_dxva2_
get_surface
(
frame
);
void
*
surface
=
get_surface
(
frame
);
unsigned
i
;
for
(
i
=
0
;
i
<
DXVA_CONTEXT_COUNT
(
avctx
,
ctx
);
i
++
)
{
...
...
@@ -159,14 +159,14 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame,
if
(
D3D11VA_CONTEXT
(
ctx
)
->
context_mutex
!=
INVALID_HANDLE_VALUE
)
WaitForSingleObjectEx
(
D3D11VA_CONTEXT
(
ctx
)
->
context_mutex
,
INFINITE
,
FALSE
);
hr
=
ID3D11VideoContext_DecoderBeginFrame
(
D3D11VA_CONTEXT
(
ctx
)
->
video_context
,
D3D11VA_CONTEXT
(
ctx
)
->
decoder
,
ff_dxva2_
get_surface
(
frame
),
get_surface
(
frame
),
0
,
NULL
);
}
#endif
#if CONFIG_DXVA2
if
(
avctx
->
pix_fmt
==
AV_PIX_FMT_DXVA2_VLD
)
hr
=
IDirectXVideoDecoder_BeginFrame
(
DXVA2_CONTEXT
(
ctx
)
->
decoder
,
ff_dxva2_
get_surface
(
frame
),
get_surface
(
frame
),
NULL
);
#endif
if
(
hr
!=
E_PENDING
||
++
runs
>
50
)
...
...
libavcodec/dxva2_internal.h
View file @
fd0716b3
...
...
@@ -96,8 +96,6 @@ typedef union {
#define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (ctx->d3d11va.cfg->ConfigResidDiffAccelerator)
#endif
void
*
ff_dxva2_get_surface
(
const
AVFrame
*
frame
);
unsigned
ff_dxva2_get_surface_index
(
const
AVCodecContext
*
avctx
,
const
AVDXVAContext
*
,
const
AVFrame
*
frame
);
...
...
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