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
aa6d32ae
Commit
aa6d32ae
authored
May 03, 2020
by
Limin Wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "avcodec/proresenc_anatoliy: support for more color matrix for proresenc"
This reverts commit
e0eed1fd
.
parent
422f1e32
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
proresenc_anatoliy.c
libavcodec/proresenc_anatoliy.c
+4
-5
No files found.
libavcodec/proresenc_anatoliy.c
View file @
aa6d32ae
...
...
@@ -55,8 +55,7 @@ static const int bitrate_table[6] = { 1000, 2100, 3500, 5400, 7000, 10000};
static
const
int
valid_primaries
[
9
]
=
{
AVCOL_PRI_RESERVED0
,
AVCOL_PRI_BT709
,
AVCOL_PRI_UNSPECIFIED
,
AVCOL_PRI_BT470BG
,
AVCOL_PRI_SMPTE170M
,
AVCOL_PRI_BT2020
,
AVCOL_PRI_SMPTE431
,
AVCOL_PRI_SMPTE432
,
INT_MAX
};
static
const
int
valid_trc
[
6
]
=
{
AVCOL_TRC_RESERVED0
,
AVCOL_TRC_BT709
,
AVCOL_TRC_UNSPECIFIED
,
AVCOL_TRC_SMPTE2084
,
AVCOL_TRC_ARIB_STD_B67
,
INT_MAX
};
static
const
int
valid_trc
[
4
]
=
{
AVCOL_TRC_RESERVED0
,
AVCOL_TRC_BT709
,
AVCOL_TRC_UNSPECIFIED
,
INT_MAX
};
static
const
int
valid_colorspace
[
5
]
=
{
AVCOL_SPC_BT709
,
AVCOL_SPC_UNSPECIFIED
,
AVCOL_SPC_SMPTE170M
,
AVCOL_SPC_BT2020_NCL
,
INT_MAX
};
...
...
@@ -758,9 +757,9 @@ static int prores_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
*
buf
++
=
frame_flags
;
*
buf
++
=
0
;
/* reserved */
/* only write color properties, if valid value. set to unspecified otherwise */
*
buf
++
=
ff_int_from_list_or_default
(
avctx
,
"frame color primaries"
,
avctx
->
color_primaries
,
valid_primaries
,
0
);
*
buf
++
=
ff_int_from_list_or_default
(
avctx
,
"frame color trc"
,
avctx
->
color_trc
,
valid_trc
,
0
);
*
buf
++
=
ff_int_from_list_or_default
(
avctx
,
"frame colorspace"
,
avctx
->
colorspace
,
valid_colorspace
,
0
);
*
buf
++
=
ff_int_from_list_or_default
(
avctx
,
"frame color primaries"
,
pict
->
color_primaries
,
valid_primaries
,
0
);
*
buf
++
=
ff_int_from_list_or_default
(
avctx
,
"frame color trc"
,
pict
->
color_trc
,
valid_trc
,
0
);
*
buf
++
=
ff_int_from_list_or_default
(
avctx
,
"frame colorspace"
,
pict
->
colorspace
,
valid_colorspace
,
0
);
if
(
avctx
->
profile
>=
FF_PROFILE_PRORES_4444
)
{
if
(
avctx
->
pix_fmt
==
AV_PIX_FMT_YUV444P10
)
{
*
buf
++
=
0xA0
;
/* src b64a and no alpha */
...
...
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