1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

vaapi_encode_h265: Reduce SAR to valid range

Matching previous commit for H.264.
This commit is contained in:
Mark Thompson 2018-10-28 17:13:54 +00:00
parent a830056b32
commit 80ce23da65

View File

@ -472,18 +472,20 @@ static int vaapi_encode_h265_init_sequence_params(AVCodecContext *avctx)
{ 80, 33 }, { 18, 11 }, { 15, 11 }, { 64, 33 },
{ 160, 99 }, { 4, 3 }, { 3, 2 }, { 2, 1 },
};
int i;
int num, den, i;
av_reduce(&num, &den, avctx->sample_aspect_ratio.num,
avctx->sample_aspect_ratio.den, 65535);
for (i = 0; i < FF_ARRAY_ELEMS(sar_idc); i++) {
if (avctx->sample_aspect_ratio.num == sar_idc[i].num &&
avctx->sample_aspect_ratio.den == sar_idc[i].den) {
if (num == sar_idc[i].num &&
den == sar_idc[i].den) {
vui->aspect_ratio_idc = i;
break;
}
}
if (i >= FF_ARRAY_ELEMS(sar_idc)) {
vui->aspect_ratio_idc = 255;
vui->sar_width = avctx->sample_aspect_ratio.num;
vui->sar_height = avctx->sample_aspect_ratio.den;
vui->sar_width = num;
vui->sar_height = den;
}
vui->aspect_ratio_info_present_flag = 1;
}