- Timestamp:
- Jun 24, 2009 3:40:25 PM (15 years ago)
- Location:
- pjproject/branches/1.0
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/1.0
- Property svn:mergeinfo changed
/pjproject/trunk merged: 2735
- Property svn:mergeinfo changed
-
pjproject/branches/1.0/pjmedia/src/pjmedia-codec/g722.c
r2394 r2791 579 579 580 580 output->type = PJMEDIA_FRAME_TYPE_AUDIO; 581 output->timestamp = input->timestamp; 581 582 582 583 TRACE_((THIS_FILE, "G722 encode(): size=%d", output->size)); … … 625 626 output->size = SAMPLES_PER_FRAME * 2; 626 627 output->type = PJMEDIA_FRAME_TYPE_AUDIO; 628 output->timestamp = input->timestamp; 627 629 628 630 #if !PLC_DISABLED -
pjproject/branches/1.0/pjmedia/src/pjmedia-codec/gsm.c
r2394 r2791 567 567 568 568 output->type = PJMEDIA_FRAME_TYPE_AUDIO; 569 output->timestamp = input->timestamp; 569 570 570 571 return PJ_SUCCESS; … … 596 597 output->size = 320; 597 598 output->type = PJMEDIA_FRAME_TYPE_AUDIO; 599 output->timestamp = input->timestamp; 598 600 599 601 #if !PLC_DISABLED -
pjproject/branches/1.0/pjmedia/src/pjmedia-codec/l16.c
r2547 r2791 651 651 output->type = PJMEDIA_FRAME_TYPE_AUDIO; 652 652 output->size = input->size; 653 output->timestamp = input->timestamp; 653 654 654 655 return PJ_SUCCESS; … … 685 686 output->type = PJMEDIA_FRAME_TYPE_AUDIO; 686 687 output->size = input->size; 688 output->timestamp = input->timestamp; 687 689 688 690 #if !PLC_DISABLED -
pjproject/branches/1.0/pjmedia/src/pjmedia/g711.c
r2394 r2791 540 540 output->type = PJMEDIA_FRAME_TYPE_AUDIO; 541 541 output->size = (input->size >> 1); 542 output->timestamp = input->timestamp; 542 543 543 544 return PJ_SUCCESS; … … 583 584 output->type = PJMEDIA_FRAME_TYPE_AUDIO; 584 585 output->size = (input->size << 1); 586 output->timestamp = input->timestamp; 585 587 586 588 #if !PLC_DISABLED
Note: See TracChangeset
for help on using the changeset viewer.