- Timestamp:
- Feb 1, 2009 2:10:49 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/port.h
r2436 r2437 265 265 * are byte-aligned although its payload may not be byte-aligned. 266 266 */ 267 268 #pragma pack(1) 267 269 typedef struct pjmedia_frame_ext { 268 270 pjmedia_frame base; /**< Base frame info */ … … 274 276 */ 275 277 } pjmedia_frame_ext; 278 #pragma pack() 276 279 277 280 /** … … 279 282 * pjmedia_frame_ext structure. 280 283 */ 284 #pragma pack(1) 281 285 typedef struct pjmedia_frame_ext_subframe { 282 286 pj_uint16_t bitlen; /**< Number of bits in the data */ … … 284 288 } pjmedia_frame_ext_subframe; 285 289 290 #pragma pack() 291 286 292 287 293 /** … … 305 311 pjmedia_frame_ext_subframe *fsub; 306 312 fsub = (pjmedia_frame_ext_subframe*) p; 307 p += fsub->bitlen / 8;313 p += sizeof(fsub->bitlen) + fsub->bitlen / 8; 308 314 if (fsub->bitlen % 8) 309 315 ++p; … … 312 318 tmp = bitlen / 8; 313 319 if (bitlen % 8) ++tmp; 320 314 321 pj_memcpy(p, &bitlen, sizeof(bitlen)); 315 pj_memcpy(p + sizeof(bitlen), src, tmp); 322 if (tmp) 323 pj_memcpy(p + sizeof(bitlen), src, tmp); 324 316 325 frm->subframe_cnt++; 317 326 frm->samples_cnt = frm->samples_cnt + samples_cnt; … … 339 348 for (i = 0; i < n; ++i) { 340 349 sf = (pjmedia_frame_ext_subframe*) p; 341 p += s f->bitlen / 8;350 p += sizeof(sf->bitlen) + sf->bitlen / 8; 342 351 if (sf->bitlen % 8) 343 352 ++p;
Note: See TracChangeset
for help on using the changeset viewer.