Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
bbaca6e8
Commit
bbaca6e8
authored
Jun 26, 2017
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/proresenc_kostya: add 4444XQ profile
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
0f8d3d8a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
3 deletions
+16
-3
encoders.texi
doc/encoders.texi
+1
-0
proresenc_kostya.c
libavcodec/proresenc_kostya.c
+15
-3
No files found.
doc/encoders.texi
View file @
bbaca6e8
...
...
@@ -2381,6 +2381,7 @@ Select the ProRes profile to encode
@item standard
@item hq
@item 4444
@item 4444xq
@end table
@item quant_mat @var{integer}
...
...
libavcodec/proresenc_kostya.c
View file @
bbaca6e8
...
...
@@ -46,6 +46,7 @@ enum {
PRORES_PROFILE_STANDARD
,
PRORES_PROFILE_HQ
,
PRORES_PROFILE_4444
,
PRORES_PROFILE_4444XQ
,
};
enum
{
...
...
@@ -124,7 +125,7 @@ static const struct prores_profile {
int
max_quant
;
int
br_tab
[
NUM_MB_LIMITS
];
int
quant
;
}
prores_profile_info
[
5
]
=
{
}
prores_profile_info
[
6
]
=
{
{
.
full_name
=
"proxy"
,
.
tag
=
MKTAG
(
'a'
,
'p'
,
'c'
,
'o'
),
...
...
@@ -164,6 +165,14 @@ static const struct prores_profile {
.
max_quant
=
6
,
.
br_tab
=
{
2350
,
1828
,
1600
,
1425
},
.
quant
=
QUANT_MAT_HQ
,
},
{
.
full_name
=
"4444XQ"
,
.
tag
=
MKTAG
(
'a'
,
'p'
,
'4'
,
'x'
),
.
min_quant
=
1
,
.
max_quant
=
6
,
.
br_tab
=
{
3525
,
2742
,
2400
,
2137
},
.
quant
=
QUANT_MAT_HQ
,
}
};
...
...
@@ -1155,7 +1164,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
:
"HQ profile to keep best quality"
);
}
if
(
av_pix_fmt_desc_get
(
avctx
->
pix_fmt
)
->
flags
&
AV_PIX_FMT_FLAG_ALPHA
)
{
if
(
ctx
->
profile
!=
PRORES_PROFILE_4444
)
{
if
(
ctx
->
profile
!=
PRORES_PROFILE_4444
&&
ctx
->
profile
!=
PRORES_PROFILE_4444XQ
)
{
// force alpha and warn
av_log
(
avctx
,
AV_LOG_WARNING
,
"Profile selected will not "
"encode alpha. Override with -profile if needed.
\n
"
);
...
...
@@ -1298,7 +1308,7 @@ static const AVOption options[] = {
AV_OPT_TYPE_INT
,
{
.
i64
=
8
},
1
,
MAX_MBS_PER_SLICE
,
VE
},
{
"profile"
,
NULL
,
OFFSET
(
profile
),
AV_OPT_TYPE_INT
,
{
.
i64
=
PRORES_PROFILE_AUTO
},
PRORES_PROFILE_AUTO
,
PRORES_PROFILE_4444
,
VE
,
"profile"
},
PRORES_PROFILE_AUTO
,
PRORES_PROFILE_4444
XQ
,
VE
,
"profile"
},
{
"auto"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
PRORES_PROFILE_AUTO
},
0
,
0
,
VE
,
"profile"
},
{
"proxy"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
PRORES_PROFILE_PROXY
},
...
...
@@ -1311,6 +1321,8 @@ static const AVOption options[] = {
0
,
0
,
VE
,
"profile"
},
{
"4444"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
PRORES_PROFILE_4444
},
0
,
0
,
VE
,
"profile"
},
{
"4444xq"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
PRORES_PROFILE_4444XQ
},
0
,
0
,
VE
,
"profile"
},
{
"vendor"
,
"vendor ID"
,
OFFSET
(
vendor
),
AV_OPT_TYPE_STRING
,
{
.
str
=
"Lavc"
},
CHAR_MIN
,
CHAR_MAX
,
VE
},
{
"bits_per_mb"
,
"desired bits per macroblock"
,
OFFSET
(
bits_per_mb
),
...
...
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