READ_UINT8 (&nr, vps->id, 4);
- /* skip reserved_three_2bits */
- if (!nal_reader_skip (&nr, 2))
- goto error;
+ READ_UINT8 (&nr, vps->base_layer_internal_flag, 1);
+ READ_UINT8 (&nr, vps->base_layer_available_flag, 1);
READ_UINT8 (&nr, vps->max_layers_minus1, 6);
READ_UINT8 (&nr, vps->max_sub_layers_minus1, 3);
/* allowd range is 0 to 1023 */
CHECK_ALLOWED_MAX (vps->num_layer_sets_minus1, 1023);
- for (i = 1; i <= vps->num_layer_sets_minus1; i++)
- for (j = 0; j <= vps->max_layer_id; j++)
+ for (i = 1; i <= vps->num_layer_sets_minus1; i++) {
+ for (j = 0; j <= vps->max_layer_id; j++) {
+ /* layer_id_included_flag[i][j] */
+ /* FIXME: need to parse this when we can support parsing multi-layer info. */
nal_reader_skip (&nr, 1);
+ }
+ }
READ_UINT8 (&nr, vps->timing_info_present_flag, 1);
vps->cprms_present_flag, vps->max_sub_layers_minus1))
goto error;
}
+
+ /* FIXME: VPS can have multiple hrd parameters, and therefore hrd_params
+ * should be an array (like Garray). But it also requires new _clear()
+ * method for free the array in GstH265VPS whenever gst_h265_parse_vps()
+ * is called. Need to work for multi-layer related parsing supporting
+ *
+ * FIXME: Following code is just work around to find correct
+ * vps_extension position */
+
+ /* skip the first parsed one above */
+ for (i = 1; i < vps->num_hrd_parameters; i++) {
+ guint16 hrd_layer_set_idx;
+ guint8 cprms_present_flag;
+ GstH265HRDParams hrd_params;
+
+ READ_UE_MAX (&nr, hrd_layer_set_idx, 1023);
+ CHECK_ALLOWED_MAX (hrd_layer_set_idx, vps->num_layer_sets_minus1);
+
+ /* need parsing if (i > 1) */
+ READ_UINT8 (&nr, cprms_present_flag, 1);
+
+ if (!gst_h265_parse_hrd_parameters (&hrd_params, &nr,
+ cprms_present_flag, vps->max_sub_layers_minus1))
+ goto error;
+ }
}
READ_UINT8 (&nr, vps->vps_extension, 1);
vps->valid = TRUE;
/**
* GstH265VPS:
* @id: vps id
+ * @base_layer_internal_flag and @base_layer_available_flag:
+ * specify availability of base layer
* @max_layers_minus1: should be zero, but can be other values in future
* @max_sub_layers_minus1:specifies the maximum number of temporal sub-layers
* @temporal_id_nesting_flag: specifies whether inter prediction is
struct _GstH265VPS {
guint8 id;
+ guint8 base_layer_internal_flag;
+ guint8 base_layer_available_flag;
+
guint8 max_layers_minus1;
guint8 max_sub_layers_minus1;
guint8 temporal_id_nesting_flag;
guint32 num_ticks_poc_diff_one_minus1;
guint16 num_hrd_parameters;
+
+ /* FIXME: following HRD related info should be an array */
guint16 hrd_layer_set_idx;
guint8 cprms_present_flag;
-
GstH265HRDParams hrd_params;
guint8 vps_extension;