Changeset 213
- Timestamp:
- Feb 22, 2006 12:25:51 AM (19 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjmedia/src/pjmedia/stream.c
r210 r213 35 35 #define THIS_FILE "stream.c" 36 36 #define ERRLEVEL 1 37 #define TRACE_(expr) PJ_LOG(3,expr)37 #define TRACE_(expr) stream_perror expr 38 38 39 39 #define PJMEDIA_MAX_FRAME_DURATION_MS 200 … … 97 97 98 98 99 /* 100 * Print error. 101 */ 102 static void stream_perror(const char *sender, const char *title, 103 pj_status_t status) 104 { 105 char errmsg[PJ_ERR_MSG_SIZE]; 106 107 pj_strerror(status, errmsg, sizeof(errmsg)); 108 PJ_LOG(3,(sender, "%s: %s [err:%d]", title, errmsg, status)); 109 } 110 99 111 100 112 /* … … 145 157 channel->pcm_buf_size, &frame_out); 146 158 if (status != 0) { 147 TRACE_((THIS_FILE, " decode() has return error status %d", status));159 TRACE_((THIS_FILE, "codec decode() error", status)); 148 160 149 161 frame->type = PJMEDIA_FRAME_TYPE_NONE; … … 153 165 /* Put in sound buffer. */ 154 166 if (frame_out.size > frame->size) { 155 TRACE_((THIS_FILE, "Sound playout buffer truncated %d bytes",156 frame_out.size - frame->size));167 PJ_LOG(4,(THIS_FILE, "Sound playout buffer truncated %d bytes", 168 frame_out.size - frame->size)); 157 169 frame_out.size = frame->size; 158 170 } … … 197 209 &frame_out); 198 210 if (status != 0) { 199 TRACE_((THIS_FILE, "Codec encode() has returned error status %d", 200 status)); 211 TRACE_((THIS_FILE, "Codec encode() error", status)); 201 212 return status; 202 213 } … … 209 220 (const void**)&rtphdr, &rtphdrlen); 210 221 if (status != 0) { 211 TRACE_((THIS_FILE, "RTP encode_rtp() has returned error status %d", 212 status)); 222 TRACE_((THIS_FILE, "RTP encode_rtp() error", status)); 213 223 return status; 214 224 } … … 217 227 /* We don't support RTP with extended header yet. */ 218 228 PJ_TODO(SUPPORT_SENDING_RTP_WITH_EXTENDED_HEADER); 219 TRACE_((THIS_FILE, "Unsupported extended RTP header for transmission"));229 //TRACE_((THIS_FILE, "Unsupported extended RTP header for transmission")); 220 230 return 0; 221 231 } … … 267 277 status = pj_sock_select(FD_SETSIZE, &fds, NULL, NULL, &timeout); 268 278 if (status < 0) { 269 char errmsg[PJ_ERR_MSG_SIZE]; 270 pj_strerror(pj_get_netos_error(), errmsg, sizeof(errmsg)); 271 TRACE_((THIS_FILE, "Jitter buffer select() error: %s", 272 errmsg)); 279 TRACE_((THIS_FILE, "Jitter buffer select() error", 280 pj_get_netos_error())); 273 281 pj_thread_sleep(500); 274 282 continue; … … 299 307 &hdr, &payload, &payloadlen); 300 308 if (status != PJ_SUCCESS) { 301 TRACE_((THIS_FILE, "RTP decode_rtp() has returned error status %d", 302 status)); 309 TRACE_((THIS_FILE, "RTP decode error", status)); 303 310 continue; 304 311 } … … 309 316 status != PJMEDIA_RTP_ESESSRESTART) 310 317 { 311 TRACE_((THIS_FILE, 312 "RTP session_update() has returned error status %d", 313 status)); 318 TRACE_((THIS_FILE, "RTP session_update error", status)); 314 319 continue; 315 320 } … … 326 331 327 332 if (status != 0) { 328 TRACE_((THIS_FILE, 329 "Jitter buffer put() has returned error status %d", 330 status)); 333 TRACE_((THIS_FILE, "Jitter buffer put() error", status)); 331 334 continue; 332 335 } -
pjproject/trunk/pjsip/build/pjsip.dsw
r197 r213 53 53 54 54 Project: "pjmedia_codec"=..\..\pjmedia\build\pjmedia_codec.dsp - Package Owner=<4> 55 56 Package=<5>57 {{{58 }}}59 60 Package=<4>61 {{{62 }}}63 64 ###############################################################################65 66 Project: "pjsip++"=".\pjsip++.dsp" - Package Owner=<4>67 55 68 56 Package=<5>
Note: See TracChangeset
for help on using the changeset viewer.