On Sun, 17 Jul 2011, Diego Biurrun wrote:
> ---
> libavformat/rtpdec.c | 16 ----------------
> libavformat/rtpproto.c | 23 -----------------------
> 2 files changed, 0 insertions(+), 39 deletions(-)
>
> diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
> index 2c262d9..3712260 100644
> --- a/libavformat/rtpdec.c
> +++ b/libavformat/rtpdec.c
> @@ -218,22 +218,6 @@ static int rtp_valid_packet_in_sequence(RTPStatistics
> *s, uint16_t seq)
> return 1;
> }
>
> -#if 0
> -/**
> -* This function is currently unused; without a valid local ntp time, I don't
> see how we could calculate the
> -* difference between the arrival and sent timestamp. As a result, the
> jitter and transit statistics values
> -* never change. I left this in in case someone else can see a way. (rdm)
> -*/
> -static void rtcp_update_jitter(RTPStatistics *s, uint32_t sent_timestamp,
> uint32_t arrival_timestamp)
> -{
> - uint32_t transit= arrival_timestamp - sent_timestamp;
> - int d;
> - s->transit= transit;
> - d= FFABS(transit - s->transit);
> - s->jitter += d - ((s->jitter + 8)>>4);
> -}
> -#endif
> -
> int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count)
> {
> AVIOContext *pb;
> diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
> index dba1d35..0367198 100644
> --- a/libavformat/rtpproto.c
> +++ b/libavformat/rtpproto.c
> @@ -225,20 +225,6 @@ static int rtp_read(URLContext *h, uint8_t *buf, int
> size)
> int len, n;
> struct pollfd p[2] = {{s->rtp_fd, POLLIN, 0}, {s->rtcp_fd, POLLIN, 0}};
>
> -#if 0
> - for(;;) {
> - from_len = sizeof(from);
> - len = recvfrom (s->rtp_fd, buf, size, 0,
> - (struct sockaddr *)&from, &from_len);
> - if (len < 0) {
> - if (ff_neterrno() == AVERROR(EAGAIN) ||
> - ff_neterrno() == AVERROR(EINTR))
> - continue;
> - return AVERROR(EIO);
> - }
> - break;
> - }
> -#else
> for(;;) {
> if (url_interrupt_cb())
> return AVERROR_EXIT;
> @@ -277,7 +263,6 @@ static int rtp_read(URLContext *h, uint8_t *buf, int size)
> return AVERROR(EIO);
> }
> }
> -#endif
> return len;
> }
>
> @@ -296,14 +281,6 @@ static int rtp_write(URLContext *h, const uint8_t *buf,
> int size)
> }
>
> ret = ffurl_write(hd, buf, size);
> -#if 0
> - {
> - struct timespec ts;
> - ts.tv_sec = 0;
> - ts.tv_nsec = 10 * 1000000;
> - nanosleep(&ts, NULL);
> - }
> -#endif
> return ret;
> }
Ok with me, I don't see any of these snippets being used anytime soon.
// Martin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
