@@ -488,30 +488,20 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx)
vui->aspect_ratio_info_present_flag = 1;
}
- if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED ||
- avctx->color_primaries != AVCOL_PRI_UNSPECIFIED ||
+ // Unspecified video format, from table E-2.
+ vui->video_format = 5;
+ vui->video_full_range_flag =
+ avctx->color_range == AVCOL_RANGE_JPEG;
+ vui->colour_primaries = avctx->color_primaries;
+ vui->transfer_characteristics = avctx->color_trc;
+ vui->matrix_coefficients = avctx->colorspace;
+ if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED ||
avctx->color_trc != AVCOL_TRC_UNSPECIFIED ||
- avctx->colorspace != AVCOL_SPC_UNSPECIFIED) {
+ avctx->colorspace != AVCOL_SPC_UNSPECIFIED)
+ vui->colour_description_present_flag = 1;
+ if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED ||
+ vui->colour_description_present_flag)
vui->video_signal_type_present_flag = 1;
- vui->video_format = 5; // Unspecified.
- vui->video_full_range_flag =
- avctx->color_range == AVCOL_RANGE_JPEG;
-
- if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED ||
- avctx->color_trc != AVCOL_TRC_UNSPECIFIED ||
- avctx->colorspace != AVCOL_SPC_UNSPECIFIED) {
- vui->colour_description_present_flag = 1;
- vui->colour_primaries = avctx->color_primaries;
- vui->transfer_characteristics = avctx->color_trc;
- vui->matrix_coefficients = avctx->colorspace;
- }
- } else {
- vui->video_format = 5;
- vui->video_full_range_flag = 0;
- vui->colour_primaries = avctx->color_primaries;
- vui->transfer_characteristics = avctx->color_trc;
- vui->matrix_coefficients = avctx->colorspace;
- }
if (avctx->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED) {
vui->chroma_loc_info_present_flag = 1;