[Ffmpeg-cvslog] r8566 - trunk/ffserver.c

alex subversion
Sat Mar 31 16:34:29 CEST 2007


Author: alex
Date: Sat Mar 31 16:34:29 2007
New Revision: 8566

Modified:
   trunk/ffserver.c

Log:
remove dead code

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	(original)
+++ trunk/ffserver.c	Sat Mar 31 16:34:29 2007
@@ -85,9 +85,6 @@ const char *http_state[] = {
 
 #define IOBUFFER_INIT_SIZE 8192
 
-/* coef for exponential mean for bitrate estimation in statistics */
-#define AVG_COEF 0.9
-
 /* timeouts are in ms */
 #define HTTP_REQUEST_TIMEOUT (15 * 1000)
 #define RTSP_REQUEST_TIMEOUT (3600 * 24 * 1000)
@@ -2234,9 +2231,6 @@ static int http_prepare_data(HTTPContext
     return 0;
 }
 
-/* in bit/s */
-#define SHORT_TERM_BANDWIDTH 8000000
-
 /* should convert the format at the same time */
 /* send data starting at c->buffer_ptr to the output connection
    (either UDP or TCP connection) */
@@ -4433,25 +4427,6 @@ static int parse_ffconfig(const char *fi
         return 0;
 }
 
-
-#if 0
-static void write_packet(FFCodec *ffenc,
-                         uint8_t *buf, int size)
-{
-    PacketHeader hdr;
-    AVCodecContext *enc = &ffenc->enc;
-    uint8_t *wptr;
-    mk_header(&hdr, enc, size);
-    wptr = http_fifo.wptr;
-    fifo_write(&http_fifo, (uint8_t *)&hdr, sizeof(hdr), &wptr);
-    fifo_write(&http_fifo, buf, size, &wptr);
-    /* atomic modification of wptr */
-    http_fifo.wptr = wptr;
-    ffenc->data_count += size;
-    ffenc->avg_frame_size = ffenc->avg_frame_size * AVG_COEF + size * (1.0 - AVG_COEF);
-}
-#endif
-
 static void show_banner(void)
 {
     printf("ffserver version " FFMPEG_VERSION ", Copyright (c) 2000-2006 Fabrice Bellard, et al.\n");




More information about the ffmpeg-cvslog mailing list