summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiza Sulistyo <riza@teluu.com>2015-03-26 10:38:30 +0000
committerRiza Sulistyo <riza@teluu.com>2015-03-26 10:38:30 +0000
commitd9790c96da17b2f298a8f2dfdfd9c9d6caa90f48 (patch)
treec3badd042796723f3b5922ebd1e8d23f36f98b94
parent678aa9a6901443b92f20ddcea98d98bf90148e92 (diff)
Re #1831: Fixed matching algorithm when the supported format only have one size.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5031 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjmedia/src/pjmedia/vid_port.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia/vid_port.c b/pjmedia/src/pjmedia/vid_port.c
index 1671b477..57919d4d 100644
--- a/pjmedia/src/pjmedia/vid_port.c
+++ b/pjmedia/src/pjmedia/vid_port.c
@@ -346,6 +346,8 @@ static struct fmt_prop find_closest_fmt(pj_uint32_t req_fmt_id,
}
/* No need to calculate ratio if exact match is found. */
if (!found_exact_match) {
+ pj_bool_t found_match = PJ_FALSE;
+
/* We have the list of supported format with nearest width. Now get the
* best ratio.
*/
@@ -360,7 +362,8 @@ static struct fmt_prop find_closest_fmt(pj_uint32_t req_fmt_id,
diff_ratio = GET_DIFF(sup_ratio, req_ratio);
- if ((i==0) || (diff_ratio <= min_diff_ratio)) {
+ if ((!found_match) || (diff_ratio <= min_diff_ratio)) {
+ found_match = PJ_TRUE;
match_idx = i;
min_diff_ratio = diff_ratio;
}