- Timestamp:
- Jul 15, 2011 10:19:59 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/stream.c
r3640 r3663 516 516 frame_out.buf = p_out_samp + samples_count; 517 517 frame_out.size = frame->size - samples_count*2; 518 status = (*stream->codec->op->recover)(stream->codec,519 520 518 status = pjmedia_codec_recover(stream->codec, 519 frame_out.size, 520 &frame_out); 521 521 522 522 ++stream->plc_cnt; … … 565 565 frame_out.buf = p_out_samp + samples_count; 566 566 frame_out.size = frame->size - samples_count*2; 567 status = (*stream->codec->op->recover)(stream->codec,568 569 567 status = pjmedia_codec_recover(stream->codec, 568 frame_out.size, 569 &frame_out); 570 570 if (status != PJ_SUCCESS) 571 571 break; … … 620 620 frame_out.buf = p_out_samp + samples_count; 621 621 frame_out.size = frame->size - samples_count*2; 622 status = (*stream->codec->op->recover)(stream->codec,623 624 622 status = pjmedia_codec_recover(stream->codec, 623 frame_out.size, 624 &frame_out); 625 625 if (status != PJ_SUCCESS) 626 626 break; … … 671 671 frame_out.buf = p_out_samp + samples_count; 672 672 frame_out.size = frame->size - samples_count*BYTES_PER_SAMPLE; 673 status = stream->codec->op->decode( stream->codec, &frame_in,674 673 status = pjmedia_codec_decode( stream->codec, &frame_in, 674 frame_out.size, &frame_out); 675 675 if (status != 0) { 676 676 LOGERR_((port->info.name.ptr, "codec decode() error", … … 775 775 frame_in.type = PJMEDIA_FRAME_TYPE_AUDIO; 776 776 777 status = stream->codec->op->decode( stream->codec, &frame_in,778 777 status = pjmedia_codec_decode( stream->codec, &frame_in, 778 0, frame); 779 779 if (status != PJ_SUCCESS) { 780 780 LOGERR_((port->info.name.ptr, "codec decode() error", … … 802 802 status = PJ_SUCCESS; 803 803 if (stream->codec->op->recover) { 804 status = (*stream->codec->op->recover)(stream->codec, 805 0, frame); 804 status = pjmedia_codec_recover(stream->codec, 0, frame); 806 805 } 807 806 … … 1249 1248 1250 1249 /* Encode! */ 1251 status = stream->codec->op->encode( stream->codec, &silence_frame,1252 1253 1254 1250 status = pjmedia_codec_encode( stream->codec, &silence_frame, 1251 channel->out_pkt_size - 1252 sizeof(pjmedia_rtp_hdr), 1253 &frame_out); 1255 1254 if (status != PJ_SUCCESS) { 1256 1255 LOGERR_((stream->port.info.name.ptr, … … 1273 1272 { 1274 1273 /* Encode! */ 1275 status = stream->codec->op->encode( stream->codec, frame,1276 1277 1278 1274 status = pjmedia_codec_encode( stream->codec, frame, 1275 channel->out_pkt_size - 1276 sizeof(pjmedia_rtp_hdr), 1277 &frame_out); 1279 1278 if (status != PJ_SUCCESS) { 1280 1279 LOGERR_((stream->port.info.name.ptr, … … 1426 1425 { 1427 1426 stream->codec_param.setting.vad = stream->vad_enabled; 1428 stream->codec->op->modify(stream->codec, &stream->codec_param);1427 pjmedia_codec_modify(stream->codec, &stream->codec_param); 1429 1428 PJ_LOG(4,(stream->port.info.name.ptr,"VAD re-enabled")); 1430 1429 } … … 1692 1691 1693 1692 /* Parse the payload. */ 1694 status = (*stream->codec->op->parse)(stream->codec, 1695 (void*)payload, 1696 payloadlen, 1697 &ts, 1698 &count, 1699 frames); 1693 status = pjmedia_codec_parse(stream->codec, (void*)payload, 1694 payloadlen, &ts, &count, frames); 1700 1695 if (status != PJ_SUCCESS) { 1701 1696 LOGERR_((stream->port.info.name.ptr, … … 2059 2054 2060 2055 /* Open the codec. */ 2061 status = stream->codec->op->open(stream->codec, &stream->codec_param);2056 status = pjmedia_codec_open(stream->codec, &stream->codec_param); 2062 2057 if (status != PJ_SUCCESS) 2063 2058 goto err_cleanup; … … 2138 2133 stream->codec_param.setting.vad = 0; 2139 2134 stream->ts_vad_disabled = 0; 2140 stream->codec->op->modify(stream->codec, &stream->codec_param);2135 pjmedia_codec_modify(stream->codec, &stream->codec_param); 2141 2136 PJ_LOG(4,(stream->port.info.name.ptr,"VAD temporarily disabled")); 2142 2137 } … … 2441 2436 2442 2437 if (stream->codec) { 2443 stream->codec->op->close(stream->codec);2438 pjmedia_codec_close(stream->codec); 2444 2439 pjmedia_codec_mgr_dealloc_codec(stream->codec_mgr, stream->codec); 2445 2440 stream->codec = NULL;
Note: See TracChangeset
for help on using the changeset viewer.