RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-09 08:09:11 +00:00
Code Issues Projects Releases Wiki Activity

lavfi/vaapi: Fix build with libva 2.1 and 2.2

Browse Source 
While the VAProcColorProperties structure was added in libva 2.1, the
colour primaries/transfer/space fields were not added until libva 2.3.
This commit is contained in:
Mark Thompson 2019-06-07 21:15:29 +01:00
parent 410a0824f0
commit a53f9fde45
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vaapi_vpp.c
View File

@ -273,7 +273,7 @@ static void vaapi_vpp_fill_colour_standard(VAAPIColourProperties *props,
int i, j, score, best_score, worst_score; int i, j, score, best_score, worst_score;
VAProcColorStandardType best_standard; VAProcColorStandardType best_standard;
#if VA_CHECK_VERSION(1, 1, 0) #if VA_CHECK_VERSION(1, 3, 0)
// If the driver supports explicit use of the standard values then just // If the driver supports explicit use of the standard values then just
// use them and avoid doing any mapping. (The driver may not support // use them and avoid doing any mapping. (The driver may not support
// some particular code point, but it still has enough information to // some particular code point, but it still has enough information to
@ -463,7 +463,7 @@ static int vaapi_vpp_colour_properties(AVFilterContext *avctx,
// If the properties weren't filled completely in the output frame and // If the properties weren't filled completely in the output frame and
// we chose a fixed standard then fill the known values in here. // we chose a fixed standard then fill the known values in here.
#if VA_CHECK_VERSION(1, 1, 0) #if VA_CHECK_VERSION(1, 3, 0)
if (output_props.va_color_standard != VAProcColorStandardExplicit) if (output_props.va_color_standard != VAProcColorStandardExplicit)
#endif #endif
{ {
@ -492,16 +492,20 @@ static int vaapi_vpp_colour_properties(AVFilterContext *avctx,
params->input_color_properties = (VAProcColorProperties) { params->input_color_properties = (VAProcColorProperties) {
.chroma_sample_location = input_props.va_chroma_sample_location, .chroma_sample_location = input_props.va_chroma_sample_location,
.color_range = input_props.va_color_range, .color_range = input_props.va_color_range,
#if VA_CHECK_VERSION(1, 3, 0)
.colour_primaries = input_props.color_primaries, .colour_primaries = input_props.color_primaries,
.transfer_characteristics = input_props.color_trc, .transfer_characteristics = input_props.color_trc,
.matrix_coefficients = input_props.colorspace, .matrix_coefficients = input_props.colorspace,
#endif
}; };
params->output_color_properties = (VAProcColorProperties) { params->output_color_properties = (VAProcColorProperties) {
.chroma_sample_location = output_props.va_chroma_sample_location, .chroma_sample_location = output_props.va_chroma_sample_location,
.color_range = output_props.va_color_range, .color_range = output_props.va_color_range,
#if VA_CHECK_VERSION(1, 3, 0)
.colour_primaries = output_props.color_primaries, .colour_primaries = output_props.color_primaries,
.transfer_characteristics = output_props.color_trc, .transfer_characteristics = output_props.color_trc,
.matrix_coefficients = output_props.colorspace, .matrix_coefficients = output_props.colorspace,
#endif
}; };
#endif #endif