Changeset 3809 for pjproject/branches/1.x/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp

Timestamp:

Oct 11, 2011 3:05:34 AM (13 years ago)

Author:

nanang

Message:

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).

File:

• pjproject/branches/1.x/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp (modified) (2 diffs)

pjproject/branches/1.x/pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp

@@ -1131 +1131 @@
                 } 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);
@@ -1140 +1140 @@
             } 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);