diff options
| -rw-r--r-- | gst-libs/gst/codecparsers/gsth265parser.c | 34 | ||||
| -rw-r--r-- | tests/check/libs/h265parser.c | 3 |
2 files changed, 23 insertions, 14 deletions
diff --git a/gst-libs/gst/codecparsers/gsth265parser.c b/gst-libs/gst/codecparsers/gsth265parser.c index 26e68b276..69166ca36 100644 --- a/gst-libs/gst/codecparsers/gsth265parser.c +++ b/gst-libs/gst/codecparsers/gsth265parser.c @@ -3582,14 +3582,6 @@ get_screen_content_coding_extensions_profile (GstH265ProfileTierLevel * ptl) 1, 1, 1, 1, 0, 0, 0, 0, 0, TRUE, 2}, {GST_H265_PROFILE_SCREEN_EXTENDED_MAIN_444_10, 1, 1, 1, 0, 0, 0, 0, 0, 0, TRUE, 3}, - /* identical to screen-extended-main-444 */ - {GST_H265_PROFILE_SCREEN_EXTENDED_HIGH_THROUGHPUT_444, - 1, 1, 1, 1, 0, 0, 0, 0, 0, TRUE, 4}, - /* identical to screen-extended-main-444-10 */ - {GST_H265_PROFILE_SCREEN_EXTENDED_HIGH_THROUGHPUT_444_10, - 1, 1, 1, 0, 0, 0, 0, 0, 0, TRUE, 5}, - {GST_H265_PROFILE_SCREEN_EXTENDED_HIGH_THROUGHPUT_444_14, - 1, 0, 0, 0, 0, 0, 0, 0, 0, TRUE, 6}, }; return get_extension_profile (profiles, G_N_ELEMENTS (profiles), ptl); @@ -3612,6 +3604,22 @@ get_scalable_format_range_extensions_profile (GstH265ProfileTierLevel * ptl) return get_extension_profile (profiles, G_N_ELEMENTS (profiles), ptl); } +static GstH265Profile + get_screen_content_coding_extensions_high_throughput_profile + (GstH265ProfileTierLevel * ptl) +{ + static H265ExtensionProfile profiles[] = { + {GST_H265_PROFILE_SCREEN_EXTENDED_HIGH_THROUGHPUT_444, + 1, 1, 1, 1, 0, 0, 0, 0, 0, TRUE, 0}, + {GST_H265_PROFILE_SCREEN_EXTENDED_HIGH_THROUGHPUT_444_10, + 1, 1, 1, 0, 0, 0, 0, 0, 0, TRUE, 1}, + {GST_H265_PROFILE_SCREEN_EXTENDED_HIGH_THROUGHPUT_444_14, + 1, 0, 0, 0, 0, 0, 0, 0, 0, TRUE, 2}, + }; + + return get_extension_profile (profiles, G_N_ELEMENTS (profiles), ptl); +} + /** * gst_h265_profile_tier_level_get_profile: * @ptl: a #GstH265ProfileTierLevel @@ -3657,16 +3665,18 @@ gst_h265_profile_tier_level_get_profile (GstH265ProfileTierLevel * ptl) return get_3d_profile (ptl); if (ptl->profile_idc == GST_H265_PROFILE_IDC_SCREEN_CONTENT_CODING - || ptl->profile_compatibility_flag[9] - || ptl->profile_idc == - GST_H265_PROFILE_IDC_HIGH_THROUGHPUT_SCREEN_CONTENT_CODING_EXTENSION - || ptl->profile_compatibility_flag[11]) + || ptl->profile_compatibility_flag[9]) return get_screen_content_coding_extensions_profile (ptl); if (ptl->profile_idc == GST_H265_PROFILE_IDC_SCALABLE_FORMAT_RANGE_EXTENSION || ptl->profile_compatibility_flag[10]) return get_scalable_format_range_extensions_profile (ptl); + if (ptl->profile_idc == + GST_H265_PROFILE_IDC_HIGH_THROUGHPUT_SCREEN_CONTENT_CODING_EXTENSION + || ptl->profile_compatibility_flag[11]) + return get_screen_content_coding_extensions_high_throughput_profile (ptl); + return GST_H265_PROFILE_INVALID; } diff --git a/tests/check/libs/h265parser.c b/tests/check/libs/h265parser.c index 0a0e4db97..5676aea0c 100644 --- a/tests/check/libs/h265parser.c +++ b/tests/check/libs/h265parser.c @@ -499,9 +499,8 @@ GST_START_TEST (test_h265_format_range_profiles_exact_match) ptl.profile_idc = 11; set_format_range_fields (&ptl, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1); - /* identical to screen-extended-main-444-10 */ g_assert_cmpuint (gst_h265_profile_tier_level_get_profile (&ptl), ==, - GST_H265_PROFILE_SCREEN_EXTENDED_MAIN_444_10); + GST_H265_PROFILE_SCREEN_EXTENDED_HIGH_THROUGHPUT_444_10); } GST_END_TEST; |