[FFmpeg-cvslog] cbs_h265: Add PTL parsing for sublayers
Mark Thompson
git at videolan.org
Sun Nov 11 19:24:49 EET 2018
ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Sat Oct 27 22:01:16 2018 +0100| [252e79663de802d8d0b38fbfdfeeda2d86b4e611] | committer: Mark Thompson
cbs_h265: Add PTL parsing for sublayers
With fate test using the SLPPLP_A_VIDYO_2 conformance file, which contains
two sublayers with full PTL information.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=252e79663de802d8d0b38fbfdfeeda2d86b4e611
---
libavcodec/cbs_h265.h | 26 +++++++++++++-
libavcodec/cbs_h265_syntax_template.c | 60 ++++++++++++++++++++++++++++++--
tests/fate/cbs.mak | 3 +-
tests/ref/fate/cbs-hevc-SLPPLP_A_VIDYO_2 | 1 +
4 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h
index cca1d7590b..97c9444cb4 100644
--- a/libavcodec/cbs_h265.h
+++ b/libavcodec/cbs_h265.h
@@ -71,7 +71,31 @@ typedef struct H265RawProfileTierLevel {
uint8_t sub_layer_profile_present_flag[HEVC_MAX_SUB_LAYERS];
uint8_t sub_layer_level_present_flag[HEVC_MAX_SUB_LAYERS];
- // TODO: much of that again for each sub-layer.
+ uint8_t sub_layer_profile_space[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_tier_flag[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_profile_idc[HEVC_MAX_SUB_LAYERS];
+
+ uint8_t sub_layer_profile_compatibility_flag[HEVC_MAX_SUB_LAYERS][32];
+
+ uint8_t sub_layer_progressive_source_flag[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_interlaced_source_flag[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_non_packed_constraint_flag[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_frame_only_constraint_flag[HEVC_MAX_SUB_LAYERS];
+
+ uint8_t sub_layer_max_12bit_constraint_flag[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_max_10bit_constraint_flag[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_max_8bit_constraint_flag[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_max_422chroma_constraint_flag[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_max_420chroma_constraint_flag[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_max_monochrome_constraint_flag[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_intra_constraint_flag[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_one_picture_only_constraint_flag[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_lower_bit_rate_constraint_flag[HEVC_MAX_SUB_LAYERS];
+ uint8_t sub_layer_max_14bit_constraint_flag[HEVC_MAX_SUB_LAYERS];
+
+ uint8_t sub_layer_inbld_flag[HEVC_MAX_SUB_LAYERS];
+
+ uint8_t sub_layer_level_idc[HEVC_MAX_SUB_LAYERS];
} H265RawProfileTierLevel;
typedef struct H265RawSubLayerHRDParameters {
diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c
index e43f3caf99..b8a9bab971 100644
--- a/libavcodec/cbs_h265_syntax_template.c
+++ b/libavcodec/cbs_h265_syntax_template.c
@@ -163,10 +163,64 @@ static int FUNC(profile_tier_level)(CodedBitstreamContext *ctx, RWContext *rw,
}
for (i = 0; i < max_num_sub_layers_minus1; i++) {
- if (current->sub_layer_profile_present_flag[i])
- return AVERROR_PATCHWELCOME;
+ if (current->sub_layer_profile_present_flag[i]) {
+ us(2, sub_layer_profile_space[i], 0, 0, 1, i);
+ flags(sub_layer_tier_flag[i], 1, i);
+ us(5, sub_layer_profile_idc[i], 0, 31, 1, i);
+
+ for (j = 0; j < 32; j++)
+ flags(sub_layer_profile_compatibility_flag[i][j], 2, i, j);
+
+ flags(sub_layer_progressive_source_flag[i], 1, i);
+ flags(sub_layer_interlaced_source_flag[i], 1, i);
+ flags(sub_layer_non_packed_constraint_flag[i], 1, i);
+ flags(sub_layer_frame_only_constraint_flag[i], 1, i);
+
+#define profile_compatible(x) (current->sub_layer_profile_idc[i] == (x) || \
+ current->sub_layer_profile_compatibility_flag[i][x])
+ if (profile_compatible(4) || profile_compatible(5) ||
+ profile_compatible(6) || profile_compatible(7) ||
+ profile_compatible(8) || profile_compatible(9) ||
+ profile_compatible(10)) {
+ flags(sub_layer_max_12bit_constraint_flag[i], 1, i);
+ flags(sub_layer_max_10bit_constraint_flag[i], 1, i);
+ flags(sub_layer_max_8bit_constraint_flag[i], 1, i);
+ flags(sub_layer_max_422chroma_constraint_flag[i], 1, i);
+ flags(sub_layer_max_420chroma_constraint_flag[i], 1, i);
+ flags(sub_layer_max_monochrome_constraint_flag[i], 1, i);
+ flags(sub_layer_intra_constraint_flag[i], 1, i);
+ flags(sub_layer_one_picture_only_constraint_flag[i], 1, i);
+ flags(sub_layer_lower_bit_rate_constraint_flag[i], 1, i);
+
+ if (profile_compatible(5)) {
+ flags(sub_layer_max_14bit_constraint_flag[i], 1, i);
+ fixed(24, sub_layer_reserved_zero_33bits, 0);
+ fixed( 9, sub_layer_reserved_zero_33bits, 0);
+ } else {
+ fixed(24, sub_layer_reserved_zero_34bits, 0);
+ fixed(10, sub_layer_reserved_zero_34bits, 0);
+ }
+ } else if (profile_compatible(2)) {
+ fixed(7, sub_layer_reserved_zero_7bits, 0);
+ flags(sub_layer_one_picture_only_constraint_flag[i], 1, i);
+ fixed(24, sub_layer_reserved_zero_43bits, 0);
+ fixed(11, sub_layer_reserved_zero_43bits, 0);
+ } else {
+ fixed(24, sub_layer_reserved_zero_43bits, 0);
+ fixed(19, sub_layer_reserved_zero_43bits, 0);
+ }
+
+ if (profile_compatible(1) || profile_compatible(2) ||
+ profile_compatible(3) || profile_compatible(4) ||
+ profile_compatible(5) || profile_compatible(9)) {
+ flags(sub_layer_inbld_flag[i], 1, i);
+ } else {
+ fixed(1, sub_layer_reserved_zero_bit, 0);
+ }
+#undef profile_compatible
+ }
if (current->sub_layer_level_present_flag[i])
- return AVERROR_PATCHWELCOME;
+ us(8, sub_layer_level_idc[i], 0, 255, 1, i);
}
return 0;
diff --git a/tests/fate/cbs.mak b/tests/fate/cbs.mak
index 911e7704aa..f2ef04ceda 100644
--- a/tests/fate/cbs.mak
+++ b/tests/fate/cbs.mak
@@ -61,7 +61,8 @@ FATE_CBS_HEVC_SAMPLES = \
LTRPSPS_A_Qualcomm_1.bit \
RPLM_A_qualcomm_4.bit \
CONFWIN_A_Sony_1.bit \
- HRD_A_Fujitsu_2.bit
+ HRD_A_Fujitsu_2.bit \
+ SLPPLP_A_VIDYO_2.bit
$(foreach N,$(FATE_CBS_HEVC_SAMPLES),$(eval $(call FATE_CBS_TEST,hevc,$(basename $(N)),hevc-conformance/$(N),hevc)))
diff --git a/tests/ref/fate/cbs-hevc-SLPPLP_A_VIDYO_2 b/tests/ref/fate/cbs-hevc-SLPPLP_A_VIDYO_2
new file mode 100644
index 0000000000..5945221a91
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-SLPPLP_A_VIDYO_2
@@ -0,0 +1 @@
+e5309cf061c06496f8fe2b8b313e6c39
More information about the ffmpeg-cvslog
mailing list