Commit e8420626 authored by Måns Rullgård's avatar Måns Rullgård

RTP: use dprintf(), allow compilation with -DDEBUG

Originally committed as revision 14211 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f94981ea
...@@ -250,13 +250,9 @@ int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count) ...@@ -250,13 +250,9 @@ int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count)
len = url_close_dyn_buf(pb, &buf); len = url_close_dyn_buf(pb, &buf);
if ((len > 0) && buf) { if ((len > 0) && buf) {
int result; int result;
#if defined(DEBUG) dprintf(s->ic, "sending %d bytes of RR\n", len);
printf("sending %d bytes of RR\n", len);
#endif
result= url_write(s->rtp_ctx, buf, len); result= url_write(s->rtp_ctx, buf, len);
#if defined(DEBUG) dprintf(s->ic, "result from url_write: %d\n", result);
printf("result from url_write: %d\n", result);
#endif
av_free(buf); av_free(buf);
} }
return 0; return 0;
......
...@@ -120,9 +120,7 @@ static void rtcp_send_sr(AVFormatContext *s1, int64_t ntp_time) ...@@ -120,9 +120,7 @@ static void rtcp_send_sr(AVFormatContext *s1, int64_t ntp_time)
RTPDemuxContext *s = s1->priv_data; RTPDemuxContext *s = s1->priv_data;
uint32_t rtp_ts; uint32_t rtp_ts;
#if defined(DEBUG) dprintf(s1, "RTCP: %02x %"PRIx64" %x\n", s->payload_type, ntp_time, s->timestamp);
printf("RTCP: %02x %"PRIx64" %x\n", s->payload_type, ntp_time, s->timestamp);
#endif
if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE) s->first_rtcp_ntp_time = ntp_time; if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE) s->first_rtcp_ntp_time = ntp_time;
s->last_rtcp_ntp_time = ntp_time; s->last_rtcp_ntp_time = ntp_time;
...@@ -146,9 +144,7 @@ void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m) ...@@ -146,9 +144,7 @@ void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m)
{ {
RTPDemuxContext *s = s1->priv_data; RTPDemuxContext *s = s1->priv_data;
#ifdef DEBUG dprintf(s1, "rtp_send_data size=%d\n", len);
printf("rtp_send_data size=%d\n", len);
#endif
/* build the RTP header */ /* build the RTP header */
put_byte(s1->pb, (RTP_VERSION << 6)); put_byte(s1->pb, (RTP_VERSION << 6));
...@@ -301,9 +297,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt) ...@@ -301,9 +297,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
int size= pkt->size; int size= pkt->size;
uint8_t *buf1= pkt->data; uint8_t *buf1= pkt->data;
#ifdef DEBUG dprintf(s1, "%d: write len=%d\n", pkt->stream_index, size);
printf("%d: write len=%d\n", pkt->stream_index, size);
#endif
rtcp_bytes = ((s->octet_count - s->last_octet_count) * RTCP_TX_RATIO_NUM) / rtcp_bytes = ((s->octet_count - s->last_octet_count) * RTCP_TX_RATIO_NUM) /
RTCP_TX_RATIO_DEN; RTCP_TX_RATIO_DEN;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment