diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2011-10-11 03:05:34 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2011-10-11 03:05:34 +0000 |
| commit | ab7e97d441581a6c544314bface8cab9fd6f4da5 (patch) | |
| tree | f00c01d914da5f6903aedd880a89c98a4b7481b1 /pjmedia | |
| parent | ccd701371c5d44869c3f66b1426d335a143b75ff (diff) | |
Misc (#1252): Wrong APS/VAS frame header generation for AMR silence/NO_DATA frame caused by using wrong 'OR' operator, was logical 'OR' instead of bitwise (thanks Johan Lantz for the report).
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@3809 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp | 4 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp b/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp index a2b67380..309aaf59 100644 --- a/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp +++ b/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp @@ -1086,7 +1086,7 @@ static void PlayCb(TAPSCommBuffer &buf, void *user_data) buf.iBuffer.Append((TUint8*)sf->data, len); } else { enum {NO_DATA_FT = 15 }; - pj_uint8_t amr_header = 4 || (NO_DATA_FT << 3); + pj_uint8_t amr_header = 4 | (NO_DATA_FT << 3); buf.iBuffer.Append(amr_header); } @@ -1095,7 +1095,7 @@ static void PlayCb(TAPSCommBuffer &buf, void *user_data) } else { /* PJMEDIA_FRAME_TYPE_NONE */ enum {NO_DATA_FT = 15 }; - pj_uint8_t amr_header = 4 || (NO_DATA_FT << 3); + pj_uint8_t amr_header = 4 | (NO_DATA_FT << 3); buf.iBuffer.Append(amr_header); diff --git a/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp b/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp index ea66650e..bcd9d75a 100644 --- a/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp +++ b/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp @@ -1130,7 +1130,7 @@ static void PlayCb(CVoIPDataBuffer *buf, void *user_data) buffer.Append((TUint8*)sf->data, len); } else { enum {NO_DATA_FT = 15 }; - pj_uint8_t amr_header = 4 || (NO_DATA_FT << 3); + pj_uint8_t amr_header = 4 | (NO_DATA_FT << 3); buffer.Append(amr_header); } @@ -1139,7 +1139,7 @@ static void PlayCb(CVoIPDataBuffer *buf, void *user_data) } else { /* PJMEDIA_FRAME_TYPE_NONE */ enum {NO_DATA_FT = 15 }; - pj_uint8_t amr_header = 4 || (NO_DATA_FT << 3); + pj_uint8_t amr_header = 4 | (NO_DATA_FT << 3); buffer.Append(amr_header); |