Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
ccb94789
Commit
ccb94789
authored
Jan 30, 2016
by
Hendrik Leppkes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hevc: support Main10 decoding through dxva2
parent
295de3ef
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
2 deletions
+14
-2
Changelog
Changelog
+1
-0
hevc.c
libavcodec/hevc.c
+12
-1
version.h
libavcodec/version.h
+1
-1
No files found.
Changelog
View file @
ccb94789
...
@@ -2,6 +2,7 @@ Entries are sorted chronologically from oldest to youngest within each release,
...
@@ -2,6 +2,7 @@ Entries are sorted chronologically from oldest to youngest within each release,
releases are sorted from youngest to oldest.
releases are sorted from youngest to oldest.
version <next>:
version <next>:
- DXVA2-accelerated HEVC Main10 decoding
version 3.0:
version 3.0:
...
...
libavcodec/hevc.c
View file @
ccb94789
...
@@ -347,7 +347,9 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fm
...
@@ -347,7 +347,9 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fm
export_stream_params
(
s
->
avctx
,
&
s
->
ps
,
sps
);
export_stream_params
(
s
->
avctx
,
&
s
->
ps
,
sps
);
if
(
sps
->
pix_fmt
==
AV_PIX_FMT_YUV420P
||
sps
->
pix_fmt
==
AV_PIX_FMT_YUVJ420P
)
{
switch
(
sps
->
pix_fmt
)
{
case
AV_PIX_FMT_YUV420P
:
case
AV_PIX_FMT_YUVJ420P
:
#if CONFIG_HEVC_DXVA2_HWACCEL
#if CONFIG_HEVC_DXVA2_HWACCEL
*
fmt
++
=
AV_PIX_FMT_DXVA2_VLD
;
*
fmt
++
=
AV_PIX_FMT_DXVA2_VLD
;
#endif
#endif
...
@@ -360,6 +362,15 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fm
...
@@ -360,6 +362,15 @@ static int set_sps(HEVCContext *s, const HEVCSPS *sps, enum AVPixelFormat pix_fm
#if CONFIG_HEVC_VDPAU_HWACCEL
#if CONFIG_HEVC_VDPAU_HWACCEL
*
fmt
++
=
AV_PIX_FMT_VDPAU
;
*
fmt
++
=
AV_PIX_FMT_VDPAU
;
#endif
#endif
break
;
case
AV_PIX_FMT_YUV420P10
:
#if CONFIG_HEVC_DXVA2_HWACCEL
*
fmt
++
=
AV_PIX_FMT_DXVA2_VLD
;
#endif
#if CONFIG_HEVC_D3D11VA_HWACCEL
*
fmt
++
=
AV_PIX_FMT_D3D11VA_VLD
;
#endif
break
;
}
}
if
(
pix_fmt
==
AV_PIX_FMT_NONE
)
{
if
(
pix_fmt
==
AV_PIX_FMT_NONE
)
{
...
...
libavcodec/version.h
View file @
ccb94789
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 24
#define LIBAVCODEC_VERSION_MINOR 24
#define LIBAVCODEC_VERSION_MICRO 10
2
#define LIBAVCODEC_VERSION_MICRO 10
3
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
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