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
10142f99
Commit
10142f99
authored
Sep 03, 2015
by
Ronald S. Bultje
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libvpxdec: explicitly signal RGB.
parent
4ecb8b41
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
0 deletions
+15
-0
libvpxdec.c
libavcodec/libvpxdec.c
+15
-0
No files found.
libavcodec/libvpxdec.c
View file @
10142f99
...
@@ -90,7 +90,12 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img)
...
@@ -90,7 +90,12 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img)
#endif
#endif
case
VPX_IMG_FMT_I444
:
case
VPX_IMG_FMT_I444
:
avctx
->
profile
=
FF_PROFILE_VP9_1
;
avctx
->
profile
=
FF_PROFILE_VP9_1
;
#if VPX_IMAGE_ABI_VERSION >= 3
avctx
->
pix_fmt
=
avctx
->
colorspace
==
AVCOL_SPC_RGB
?
AV_PIX_FMT_GBRP
:
AV_PIX_FMT_YUV444P
;
#else
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV444P
;
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV444P
;
#endif
return
0
;
return
0
;
#ifdef VPX_IMG_FMT_HIGHBITDEPTH
#ifdef VPX_IMG_FMT_HIGHBITDEPTH
case
VPX_IMG_FMT_I42016
:
case
VPX_IMG_FMT_I42016
:
...
@@ -107,10 +112,20 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img)
...
@@ -107,10 +112,20 @@ static int set_pix_fmt(AVCodecContext *avctx, struct vpx_image *img)
case
VPX_IMG_FMT_I42216
:
case
VPX_IMG_FMT_I42216
:
avctx
->
profile
=
FF_PROFILE_VP9_3
;
avctx
->
profile
=
FF_PROFILE_VP9_3
;
if
(
img
->
bit_depth
==
10
)
{
if
(
img
->
bit_depth
==
10
)
{
#if VPX_IMAGE_ABI_VERSION >= 3
avctx
->
pix_fmt
=
avctx
->
colorspace
==
AVCOL_SPC_RGB
?
AV_PIX_FMT_GBRP10LE
:
AV_PIX_FMT_YUV422P10LE
;
#else
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV422P10LE
;
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV422P10LE
;
#endif
return
0
;
return
0
;
}
else
if
(
img
->
bit_depth
==
12
)
{
}
else
if
(
img
->
bit_depth
==
12
)
{
#if VPX_IMAGE_ABI_VERSION >= 3
avctx
->
pix_fmt
=
avctx
->
colorspace
==
AVCOL_SPC_RGB
?
AV_PIX_FMT_GBRP12LE
:
AV_PIX_FMT_YUV422P12LE
;
#else
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV422P12LE
;
avctx
->
pix_fmt
=
AV_PIX_FMT_YUV422P12LE
;
#endif
return
0
;
return
0
;
}
else
{
}
else
{
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
...
...
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