kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_format_attr_h264: Do not reset string buffer."

Browse Source
This commit is contained in:
Joshua Colp
2015-11-20 09:20:43 -06:00
committed by Gerrit Code Review
parent 1ef6c35367 92ea46ba94
commit 66d9eab072
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/res_format_attr_h264.c
View File

@@ -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 (field != H264_ATTR_KEY_UNSET) { \
if (added) { \ if (added) { \
ast_str_append(str, 0, ";"); \ ast_str_append(str, 0, ";"); \
} else { \ } else if (0 < ast_str_append(str, 0, "a=fmtp:%u ", payload)) { \
added = 1; \ added = 1; \
} \ } \
ast_str_append(str, 0, "%s=%u", name, field); \ 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 (field) { \
if (added) { \ if (added) { \
ast_str_append(str, 0, ";"); \ ast_str_append(str, 0, ";"); \
} else { \ } else if (0 < ast_str_append(str, 0, "a=fmtp:%u ", payload)) { \
added = 1; \ added = 1; \
} \ } \
ast_str_append(str, 0, "%s=%u", name, field); \ 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; return;
} }
ast_str_append(str, 0, "a=fmtp:%u ", payload);
APPEND_IF_NONZERO(attr->MAX_MBPS, str, "max-mbps"); APPEND_IF_NONZERO(attr->MAX_MBPS, str, "max-mbps");
APPEND_IF_NONZERO(attr->MAX_FS, str, "max-fs"); APPEND_IF_NONZERO(attr->MAX_FS, str, "max-fs");
APPEND_IF_NONZERO(attr->MAX_CPB, str, "max-cpb"); 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 (attr->PROFILE_IDC && attr->PROFILE_IOP && attr->LEVEL) {
if (added) { if (added) {
ast_str_append(str, 0, ";"); ast_str_append(str, 0, ";");
} else { } else if (0 < ast_str_append(str, 0, "a=fmtp:%u ", payload)) {
added = 1; added = 1;
} }
ast_str_append(str, 0, "profile-level-id=%02X%02X%02X", attr->PROFILE_IDC, attr->PROFILE_IOP, attr->LEVEL); 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 (!ast_strlen_zero(attr->SPS) && !ast_strlen_zero(attr->PPS)) {
if (added) { if (added) {
ast_str_append(str, 0, ";"); ast_str_append(str, 0, ";");
} else { } else if (0 < ast_str_append(str, 0, "a=fmtp:%u ", payload)) {
added = 1; 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) { if (added) {
ast_str_reset(*str);
} else {
ast_str_append(str, 0, "\r\n"); ast_str_append(str, 0, "\r\n");
} }