aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Thompson <sw@jkqxz.net>2019-05-06 22:02:23 +0100
committerMark Thompson <sw@jkqxz.net>2019-07-07 13:29:51 +0100
commitcd3578a8e4e11e0ba021e621367a7974d6de5da0 (patch)
tree2b67253b2bafebe020cf7df79f6274c6a1ba8f9c
parente3424575f5882a8fd97ada4081c20c92b550bcc0 (diff)
downloadffmpeg-cd3578a8e4e11e0ba021e621367a7974d6de5da0.tar.gz
lavc/h265_profile_level: Add new profiles
Monochrome 10 and Main 10 Still Picture profiles are added by the 2018 version of the standard.
-rw-r--r--libavcodec/h265_profile_level.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/h265_profile_level.c b/libavcodec/h265_profile_level.c
index 126f8dbc2a..70db1a52f6 100644
--- a/libavcodec/h265_profile_level.c
+++ b/libavcodec/h265_profile_level.c
@@ -47,6 +47,8 @@ static const H265ProfileDescriptor h265_profiles[] = {
// | | | 10bit | | | intra | | | FormatCapabilityFactor
{ "Monochrome", // | | | | | | | | | | |
4, 0, 2, 1, 1, 1, 1, 1, 1, 0, 0, 1, 667, 733, 1.000, 1.0, 6 },
+ { "Monochrome 10",
+ 4, 0, 2, 1, 1, 0, 1, 1, 1, 0, 0, 1, 833, 917, 1.250, 1.0, 6 },
{ "Monochrome 12",
4, 0, 2, 1, 0, 0, 1, 1, 1, 0, 0, 1, 1000, 1100, 1.500, 1.0, 6 },
{ "Monochrome 16",
@@ -56,13 +58,15 @@ static const H265ProfileDescriptor h265_profiles[] = {
{ "Screen-Extended Main",
9, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1000, 1100, 1.500, 1.0, 7 },
{ "Main 10",
- 2, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1000, 1100, 1.875, 1.0, 6 },
+ 2, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 1000, 1100, 1.875, 1.0, 6 },
{ "Screen-Extended Main 10",
9, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1000, 1100, 1.875, 1.0, 7 },
{ "Main 12",
4, 0, 2, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1500, 1650, 2.250, 1.0, 6 },
{ "Main Still Picture",
3, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1000, 1100, 1.500, 1.0, 6 },
+ { "Main 10 Still Picture",
+ 2, 0, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1000, 1100, 1.875, 1.0, 6 },
{ "Main 4:2:2 10",
4, 0, 2, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1667, 1833, 2.500, 0.5, 6 },
{ "Main 4:2:2 12",