Find closest camera format when resolution is presented more than once (#3062)

remotes/origin/ip-change-early
lukas-nowak 2 years ago committed by GitHub
parent b0a0fc785e
commit 79421add77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -354,17 +354,25 @@ static struct fmt_prop find_closest_fmt(pj_uint32_t req_fmt_id,
/* Fill the nearest width list. */
if (diff_width1 <= diff_width2) {
int k = 1;
pjmedia_rect_size tmp_size = vfd->size;
int k = 0;
while (((k < PJ_ARRAY_SIZE(nearest_width)) &&
(!((vfd->size.w == nearest_width[k].w) &&
(vfd->size.h == nearest_width[k].h))))) {
++k;
}
if (k < PJ_ARRAY_SIZE(nearest_width)) {
/* resolution was already processed */
continue;
}
k = 1;
while(((k < PJ_ARRAY_SIZE(nearest_width)) &&
(GET_DIFF(tmp_size.w, req_fmt_size->w) <
(GET_DIFF(nearest_width[k].w, req_fmt_size->w)))))
(diff_width1 < (GET_DIFF(nearest_width[k].w, req_fmt_size->w)))))
{
nearest_width[k-1] = nearest_width[k];
++k;
}
nearest_width[k-1] = tmp_size;
nearest_width[k-1] = vfd->size;
}
}
/* No need to calculate ratio if exact match is found. */

Loading…
Cancel
Save