diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-11-20 09:20:51 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-11-20 09:20:51 -0600 |
| commit | bdc7845a43c66cce52b90bfe2ce68c3c4694ae94 (patch) | |
| tree | af35dde2e24f9236aed33030026c0712241080e6 | |
| parent | 8f71263e72268bb4966fa7d8f68a0a8b99419ec5 (diff) | |
| parent | 1aa552b2a28d51ef9d6ac4f236ee9852b0ca449a (diff) | |
Merge "res_format_attr_h264: Do not reset string buffer." into 13
| -rw-r--r-- | res/res_format_attr_h264.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/res/res_format_attr_h264.c b/res/res_format_attr_h264.c index d263a556f..34793ef6b 100644 --- a/res/res_format_attr_h264.c +++ b/res/res_format_attr_h264.c @@ -236,7 +236,7 @@ static struct ast_format *h264_parse_sdp_fmtp(const struct ast_format *format, c if (field != H264_ATTR_KEY_UNSET) { \ if (added) { \ ast_str_append(str, 0, ";"); \ - } else { \ + } else if (0 < ast_str_append(str, 0, "a=fmtp:%u ", payload)) { \ added = 1; \ } \ ast_str_append(str, 0, "%s=%u", name, field); \ @@ -247,7 +247,7 @@ static struct ast_format *h264_parse_sdp_fmtp(const struct ast_format *format, c if (field) { \ if (added) { \ ast_str_append(str, 0, ";"); \ - } else { \ + } else if (0 < ast_str_append(str, 0, "a=fmtp:%u ", payload)) { \ added = 1; \ } \ ast_str_append(str, 0, "%s=%u", name, field); \ @@ -263,8 +263,6 @@ static void h264_generate_sdp_fmtp(const struct ast_format *format, unsigned int return; } - ast_str_append(str, 0, "a=fmtp:%u ", payload); - APPEND_IF_NONZERO(attr->MAX_MBPS, str, "max-mbps"); APPEND_IF_NONZERO(attr->MAX_FS, str, "max-fs"); APPEND_IF_NONZERO(attr->MAX_CPB, str, "max-cpb"); @@ -287,7 +285,7 @@ static void h264_generate_sdp_fmtp(const struct ast_format *format, unsigned int if (attr->PROFILE_IDC && attr->PROFILE_IOP && attr->LEVEL) { if (added) { ast_str_append(str, 0, ";"); - } else { + } else if (0 < ast_str_append(str, 0, "a=fmtp:%u ", payload)) { added = 1; } ast_str_append(str, 0, "profile-level-id=%02X%02X%02X", attr->PROFILE_IDC, attr->PROFILE_IOP, attr->LEVEL); @@ -296,15 +294,13 @@ static void h264_generate_sdp_fmtp(const struct ast_format *format, unsigned int if (!ast_strlen_zero(attr->SPS) && !ast_strlen_zero(attr->PPS)) { if (added) { ast_str_append(str, 0, ";"); - } else { + } else if (0 < ast_str_append(str, 0, "a=fmtp:%u ", payload)) { added = 1; } - ast_str_append(str, 0, ";sprop-parameter-sets=%s,%s", attr->SPS, attr->PPS); + ast_str_append(str, 0, "sprop-parameter-sets=%s,%s", attr->SPS, attr->PPS); } - if (!added) { - ast_str_reset(*str); - } else { + if (added) { ast_str_append(str, 0, "\r\n"); } |