Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avio: avio_ prefix for url_fprintf

Browse Source 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
oldabi
Anton Khirnov 14 years ago committed by Ronald S. Bultje
parent af02073225
commit d9d86e00b2
4 changed files with 86 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 126
      ffserver.c
  2. 9
      libavformat/avio.h
  3. 14
      libavformat/aviobuf.c
  4. 6
      libavformat/ffmetaenc.c

126
ffserver.c
Unescape View File

@ -1861,7 +1861,7 @@ static void fmt_bytecount(AVIOContext *pb, int64_t count)
for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++); for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++);
url_fprintf(pb, "%"PRId64"%c", count, *s); avio_printf(pb, "%"PRId64"%c", count, *s);
} }
static void compute_status(HTTPContext *c) static void compute_status(HTTPContext *c)
@ -1880,20 +1880,20 @@ static void compute_status(HTTPContext *c)
return; return;
} }
url_fprintf(pb, "HTTP/1.0 200 OK\r\n"); avio_printf(pb, "HTTP/1.0 200 OK\r\n");
url_fprintf(pb, "Content-type: %s\r\n", "text/html"); avio_printf(pb, "Content-type: %s\r\n", "text/html");
url_fprintf(pb, "Pragma: no-cache\r\n"); avio_printf(pb, "Pragma: no-cache\r\n");
url_fprintf(pb, "\r\n"); avio_printf(pb, "\r\n");
url_fprintf(pb, "<html><head><title>%s Status</title>\n", program_name); avio_printf(pb, "<html><head><title>%s Status</title>\n", program_name);
if (c->stream->feed_filename[0]) if (c->stream->feed_filename[0])
url_fprintf(pb, "<link rel=\"shortcut icon\" href=\"%s\">\n", c->stream->feed_filename); avio_printf(pb, "<link rel=\"shortcut icon\" href=\"%s\">\n", c->stream->feed_filename);
url_fprintf(pb, "</head>\n<body>"); avio_printf(pb, "</head>\n<body>");
url_fprintf(pb, "<h1>%s Status</h1>\n", program_name); avio_printf(pb, "<h1>%s Status</h1>\n", program_name);
/* format status */ /* format status */
url_fprintf(pb, "<h2>Available Streams</h2>\n"); avio_printf(pb, "<h2>Available Streams</h2>\n");
url_fprintf(pb, "<table cellspacing=0 cellpadding=4>\n"); avio_printf(pb, "<table cellspacing=0 cellpadding=4>\n");
url_fprintf(pb, "<tr><th valign=top>Path<th align=left>Served<br>Conns<th><br>bytes<th valign=top>Format<th>Bit rate<br>kbits/s<th align=left>Video<br>kbits/s<th><br>Codec<th align=left>Audio<br>kbits/s<th><br>Codec<th align=left valign=top>Feed\n"); avio_printf(pb, "<tr><th valign=top>Path<th align=left>Served<br>Conns<th><br>bytes<th valign=top>Format<th>Bit rate<br>kbits/s<th align=left>Video<br>kbits/s<th><br>Codec<th align=left>Audio<br>kbits/s<th><br>Codec<th align=left valign=top>Feed\n");
stream = first_stream; stream = first_stream;
while (stream != NULL) { while (stream != NULL) {
char sfilename[1024]; char sfilename[1024];
@ -1921,9 +1921,9 @@ static void compute_status(HTTPContext *c)
} }
} }
url_fprintf(pb, "<tr><td><a href=\"/%s\">%s</a> ", avio_printf(pb, "<tr><td><a href=\"/%s\">%s</a> ",
sfilename, stream->filename); sfilename, stream->filename);
url_fprintf(pb, "<td align=right> %d <td align=right> ", avio_printf(pb, "<td align=right> %d <td align=right> ",
stream->conns_served); stream->conns_served);
fmt_bytecount(pb, stream->bytes_served); fmt_bytecount(pb, stream->bytes_served);
switch(stream->stream_type) { switch(stream->stream_type) {
@ -1962,33 +1962,33 @@ static void compute_status(HTTPContext *c)
abort(); abort();
} }
} }
url_fprintf(pb, "<td align=center> %s <td align=right> %d <td align=right> %d <td> %s %s <td align=right> %d <td> %s %s", avio_printf(pb, "<td align=center> %s <td align=right> %d <td align=right> %d <td> %s %s <td align=right> %d <td> %s %s",
stream->fmt->name, stream->fmt->name,
stream->bandwidth, stream->bandwidth,
video_bit_rate / 1000, video_codec_name, video_codec_name_extra, video_bit_rate / 1000, video_codec_name, video_codec_name_extra,
audio_bit_rate / 1000, audio_codec_name, audio_codec_name_extra); audio_bit_rate / 1000, audio_codec_name, audio_codec_name_extra);
if (stream->feed) if (stream->feed)
url_fprintf(pb, "<td>%s", stream->feed->filename); avio_printf(pb, "<td>%s", stream->feed->filename);
else else
url_fprintf(pb, "<td>%s", stream->feed_filename); avio_printf(pb, "<td>%s", stream->feed_filename);
url_fprintf(pb, "\n"); avio_printf(pb, "\n");
} }
break; break;
default: default:
url_fprintf(pb, "<td align=center> - <td align=right> - <td align=right> - <td><td align=right> - <td>\n"); avio_printf(pb, "<td align=center> - <td align=right> - <td align=right> - <td><td align=right> - <td>\n");
break; break;
} }
} }
stream = stream->next; stream = stream->next;
} }
url_fprintf(pb, "</table>\n"); avio_printf(pb, "</table>\n");
stream = first_stream; stream = first_stream;
while (stream != NULL) { while (stream != NULL) {
if (stream->feed == stream) { if (stream->feed == stream) {
url_fprintf(pb, "<h2>Feed %s</h2>", stream->filename); avio_printf(pb, "<h2>Feed %s</h2>", stream->filename);
if (stream->pid) { if (stream->pid) {
url_fprintf(pb, "Running as pid %d.\n", stream->pid); avio_printf(pb, "Running as pid %d.\n", stream->pid);
#if defined(linux) && !defined(CONFIG_NOCUTILS) #if defined(linux) && !defined(CONFIG_NOCUTILS)
{ {
@ -2007,7 +2007,7 @@ static void compute_status(HTTPContext *c)
if (fscanf(pid_stat, "%10s %64s", cpuperc, if (fscanf(pid_stat, "%10s %64s", cpuperc,
cpuused) == 2) { cpuused) == 2) {
url_fprintf(pb, "Currently using %s%% of the cpu. Total time used %s.\n", avio_printf(pb, "Currently using %s%% of the cpu. Total time used %s.\n",
cpuperc, cpuused); cpuperc, cpuused);
} }
fclose(pid_stat); fclose(pid_stat);
@ -2015,9 +2015,9 @@ static void compute_status(HTTPContext *c)
} }
#endif #endif
url_fprintf(pb, "<p>"); avio_printf(pb, "<p>");
} }
url_fprintf(pb, "<table cellspacing=0 cellpadding=4><tr><th>Stream<th>type<th>kbits/s<th align=left>codec<th align=left>Parameters\n"); avio_printf(pb, "<table cellspacing=0 cellpadding=4><tr><th>Stream<th>type<th>kbits/s<th align=left>codec<th align=left>Parameters\n");
for (i = 0; i < stream->nb_streams; i++) { for (i = 0; i < stream->nb_streams; i++) {
AVStream *st = stream->streams[i]; AVStream *st = stream->streams[i];
@ -2040,26 +2040,26 @@ static void compute_status(HTTPContext *c)
default: default:
abort(); abort();
} }
url_fprintf(pb, "<tr><td align=right>%d<td>%s<td align=right>%d<td>%s<td>%s\n", avio_printf(pb, "<tr><td align=right>%d<td>%s<td align=right>%d<td>%s<td>%s\n",
i, type, st->codec->bit_rate/1000, codec ? codec->name : "", parameters); i, type, st->codec->bit_rate/1000, codec ? codec->name : "", parameters);
} }
url_fprintf(pb, "</table>\n"); avio_printf(pb, "</table>\n");
} }
stream = stream->next; stream = stream->next;
} }
/* connection status */ /* connection status */
url_fprintf(pb, "<h2>Connection Status</h2>\n"); avio_printf(pb, "<h2>Connection Status</h2>\n");
url_fprintf(pb, "Number of connections: %d / %d<br>\n", avio_printf(pb, "Number of connections: %d / %d<br>\n",
nb_connections, nb_max_connections); nb_connections, nb_max_connections);
url_fprintf(pb, "Bandwidth in use: %"PRIu64"k / %"PRIu64"k<br>\n", avio_printf(pb, "Bandwidth in use: %"PRIu64"k / %"PRIu64"k<br>\n",
current_bandwidth, max_bandwidth); current_bandwidth, max_bandwidth);
url_fprintf(pb, "<table>\n"); avio_printf(pb, "<table>\n");
url_fprintf(pb, "<tr><th>#<th>File<th>IP<th>Proto<th>State<th>Target bits/sec<th>Actual bits/sec<th>Bytes transferred\n"); avio_printf(pb, "<tr><th>#<th>File<th>IP<th>Proto<th>State<th>Target bits/sec<th>Actual bits/sec<th>Bytes transferred\n");
c1 = first_http_ctx; c1 = first_http_ctx;
i = 0; i = 0;
while (c1 != NULL) { while (c1 != NULL) {
@ -2078,7 +2078,7 @@ static void compute_status(HTTPContext *c)
i++; i++;
p = inet_ntoa(c1->from_addr.sin_addr); p = inet_ntoa(c1->from_addr.sin_addr);
url_fprintf(pb, "<tr><td><b>%d</b><td>%s%s<td>%s<td>%s<td>%s<td align=right>", avio_printf(pb, "<tr><td><b>%d</b><td>%s%s<td>%s<td>%s<td>%s<td align=right>",
i, i,
c1->stream ? c1->stream->filename : "", c1->stream ? c1->stream->filename : "",
c1->state == HTTPSTATE_RECEIVE_DATA ? "(input)" : "", c1->state == HTTPSTATE_RECEIVE_DATA ? "(input)" : "",
@ -2086,20 +2086,20 @@ static void compute_status(HTTPContext *c)
c1->protocol, c1->protocol,
http_state[c1->state]); http_state[c1->state]);
fmt_bytecount(pb, bitrate); fmt_bytecount(pb, bitrate);
url_fprintf(pb, "<td align=right>"); avio_printf(pb, "<td align=right>");
fmt_bytecount(pb, compute_datarate(&c1->datarate, c1->data_count) * 8); fmt_bytecount(pb, compute_datarate(&c1->datarate, c1->data_count) * 8);
url_fprintf(pb, "<td align=right>"); avio_printf(pb, "<td align=right>");
fmt_bytecount(pb, c1->data_count); fmt_bytecount(pb, c1->data_count);
url_fprintf(pb, "\n"); avio_printf(pb, "\n");
c1 = c1->next; c1 = c1->next;
} }
url_fprintf(pb, "</table>\n"); avio_printf(pb, "</table>\n");
/* date */ /* date */
ti = time(NULL); ti = time(NULL);
p = ctime(&ti); p = ctime(&ti);
url_fprintf(pb, "<hr size=1 noshade>Generated at %s", p); avio_printf(pb, "<hr size=1 noshade>Generated at %s", p);
url_fprintf(pb, "</body>\n</html>\n"); avio_printf(pb, "</body>\n</html>\n");
len = url_close_dyn_buf(pb, &c->pb_buffer); len = url_close_dyn_buf(pb, &c->pb_buffer);
c->buffer_ptr = c->pb_buffer; c->buffer_ptr = c->pb_buffer;
@ -2812,20 +2812,20 @@ static void rtsp_reply_header(HTTPContext *c, enum RTSPStatusCode error_number)
break; break;
} }
url_fprintf(c->pb, "RTSP/1.0 %d %s\r\n", error_number, str); avio_printf(c->pb, "RTSP/1.0 %d %s\r\n", error_number, str);
url_fprintf(c->pb, "CSeq: %d\r\n", c->seq); avio_printf(c->pb, "CSeq: %d\r\n", c->seq);
/* output GMT time */ /* output GMT time */
ti = time(NULL); ti = time(NULL);
tm = gmtime(&ti); tm = gmtime(&ti);
strftime(buf2, sizeof(buf2), "%a, %d %b %Y %H:%M:%S", tm); strftime(buf2, sizeof(buf2), "%a, %d %b %Y %H:%M:%S", tm);
url_fprintf(c->pb, "Date: %s GMT\r\n", buf2); avio_printf(c->pb, "Date: %s GMT\r\n", buf2);
} }
static void rtsp_reply_error(HTTPContext *c, enum RTSPStatusCode error_number) static void rtsp_reply_error(HTTPContext *c, enum RTSPStatusCode error_number)
{ {
rtsp_reply_header(c, error_number); rtsp_reply_header(c, error_number);
url_fprintf(c->pb, "\r\n"); avio_printf(c->pb, "\r\n");
} }
static int rtsp_parse_request(HTTPContext *c) static int rtsp_parse_request(HTTPContext *c)
@ -2970,10 +2970,10 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
static void rtsp_cmd_options(HTTPContext *c, const char *url) static void rtsp_cmd_options(HTTPContext *c, const char *url)
{ {
// rtsp_reply_header(c, RTSP_STATUS_OK); // rtsp_reply_header(c, RTSP_STATUS_OK);
url_fprintf(c->pb, "RTSP/1.0 %d %s\r\n", RTSP_STATUS_OK, "OK"); avio_printf(c->pb, "RTSP/1.0 %d %s\r\n", RTSP_STATUS_OK, "OK");
url_fprintf(c->pb, "CSeq: %d\r\n", c->seq); avio_printf(c->pb, "CSeq: %d\r\n", c->seq);
url_fprintf(c->pb, "Public: %s\r\n", "OPTIONS, DESCRIBE, SETUP, TEARDOWN, PLAY, PAUSE"); avio_printf(c->pb, "Public: %s\r\n", "OPTIONS, DESCRIBE, SETUP, TEARDOWN, PLAY, PAUSE");
url_fprintf(c->pb, "\r\n"); avio_printf(c->pb, "\r\n");
} }
static void rtsp_cmd_describe(HTTPContext *c, const char *url) static void rtsp_cmd_describe(HTTPContext *c, const char *url)
@ -3014,10 +3014,10 @@ static void rtsp_cmd_describe(HTTPContext *c, const char *url)
return; return;
} }
rtsp_reply_header(c, RTSP_STATUS_OK); rtsp_reply_header(c, RTSP_STATUS_OK);
url_fprintf(c->pb, "Content-Base: %s/\r\n", url); avio_printf(c->pb, "Content-Base: %s/\r\n", url);
url_fprintf(c->pb, "Content-Type: application/sdp\r\n"); avio_printf(c->pb, "Content-Type: application/sdp\r\n");
url_fprintf(c->pb, "Content-Length: %d\r\n", content_length); avio_printf(c->pb, "Content-Length: %d\r\n", content_length);
url_fprintf(c->pb, "\r\n"); avio_printf(c->pb, "\r\n");
avio_write(c->pb, content, content_length); avio_write(c->pb, content, content_length);
av_free(content); av_free(content);
} }
@ -3163,30 +3163,30 @@ static void rtsp_cmd_setup(HTTPContext *c, const char *url,
/* now everything is OK, so we can send the connection parameters */ /* now everything is OK, so we can send the connection parameters */
rtsp_reply_header(c, RTSP_STATUS_OK); rtsp_reply_header(c, RTSP_STATUS_OK);
/* session ID */ /* session ID */
url_fprintf(c->pb, "Session: %s\r\n", rtp_c->session_id); avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id);
switch(rtp_c->rtp_protocol) { switch(rtp_c->rtp_protocol) {
case RTSP_LOWER_TRANSPORT_UDP: case RTSP_LOWER_TRANSPORT_UDP:
rtp_port = rtp_get_local_rtp_port(rtp_c->rtp_handles[stream_index]); rtp_port = rtp_get_local_rtp_port(rtp_c->rtp_handles[stream_index]);
rtcp_port = rtp_get_local_rtcp_port(rtp_c->rtp_handles[stream_index]); rtcp_port = rtp_get_local_rtcp_port(rtp_c->rtp_handles[stream_index]);
url_fprintf(c->pb, "Transport: RTP/AVP/UDP;unicast;" avio_printf(c->pb, "Transport: RTP/AVP/UDP;unicast;"
"client_port=%d-%d;server_port=%d-%d", "client_port=%d-%d;server_port=%d-%d",
th->client_port_min, th->client_port_max, th->client_port_min, th->client_port_max,
rtp_port, rtcp_port); rtp_port, rtcp_port);
break; break;
case RTSP_LOWER_TRANSPORT_TCP: case RTSP_LOWER_TRANSPORT_TCP:
url_fprintf(c->pb, "Transport: RTP/AVP/TCP;interleaved=%d-%d", avio_printf(c->pb, "Transport: RTP/AVP/TCP;interleaved=%d-%d",
stream_index * 2, stream_index * 2 + 1); stream_index * 2, stream_index * 2 + 1);
break; break;
default: default:
break; break;
} }
if (setup.transport_option[0] != '\0') if (setup.transport_option[0] != '\0')
url_fprintf(c->pb, ";%s", setup.transport_option); avio_printf(c->pb, ";%s", setup.transport_option);
url_fprintf(c->pb, "\r\n"); avio_printf(c->pb, "\r\n");
url_fprintf(c->pb, "\r\n"); avio_printf(c->pb, "\r\n");
} }
@ -3248,8 +3248,8 @@ static void rtsp_cmd_play(HTTPContext *c, const char *url, RTSPMessageHeader *h)
/* now everything is OK, so we can send the connection parameters */ /* now everything is OK, so we can send the connection parameters */
rtsp_reply_header(c, RTSP_STATUS_OK); rtsp_reply_header(c, RTSP_STATUS_OK);
/* session ID */ /* session ID */
url_fprintf(c->pb, "Session: %s\r\n", rtp_c->session_id); avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id);
url_fprintf(c->pb, "\r\n"); avio_printf(c->pb, "\r\n");
} }
static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPMessageHeader *h) static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPMessageHeader *h)
@ -3273,8 +3273,8 @@ static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPMessageHeader *h
/* now everything is OK, so we can send the connection parameters */ /* now everything is OK, so we can send the connection parameters */
rtsp_reply_header(c, RTSP_STATUS_OK); rtsp_reply_header(c, RTSP_STATUS_OK);
/* session ID */ /* session ID */
url_fprintf(c->pb, "Session: %s\r\n", rtp_c->session_id); avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id);
url_fprintf(c->pb, "\r\n"); avio_printf(c->pb, "\r\n");
} }
static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader *h) static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader *h)
@ -3296,8 +3296,8 @@ static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader
/* now everything is OK, so we can send the connection parameters */ /* now everything is OK, so we can send the connection parameters */
rtsp_reply_header(c, RTSP_STATUS_OK); rtsp_reply_header(c, RTSP_STATUS_OK);
/* session ID */ /* session ID */
url_fprintf(c->pb, "Session: %s\r\n", session_id); avio_printf(c->pb, "Session: %s\r\n", session_id);
url_fprintf(c->pb, "\r\n"); avio_printf(c->pb, "\r\n");
} }

9
libavformat/avio.h
Unescape View File

@ -430,6 +430,11 @@ attribute_deprecated int64_t url_fsize(AVIOContext *s);
#define URL_EOF (-1) #define URL_EOF (-1)
attribute_deprecated int url_fgetc(AVIOContext *s); attribute_deprecated int url_fgetc(AVIOContext *s);
attribute_deprecated int url_setbufsize(AVIOContext *s, int buf_size); attribute_deprecated int url_setbufsize(AVIOContext *s, int buf_size);
#ifdef __GNUC__
attribute_deprecated int url_fprintf(AVIOContext *s, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
#else
attribute_deprecated int url_fprintf(AVIOContext *s, const char *fmt, ...);
#endif
/** /**
* @} * @}
*/ */
@ -513,9 +518,9 @@ int64_t av_url_read_fseek(AVIOContext *h, int stream_index,
/** @warning currently size is limited */ /** @warning currently size is limited */
#ifdef __GNUC__ #ifdef __GNUC__
int url_fprintf(AVIOContext *s, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3))); int avio_printf(AVIOContext *s, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
#else #else
int url_fprintf(AVIOContext *s, const char *fmt, ...); int avio_printf(AVIOContext *s, const char *fmt, ...);
#endif #endif
#if FF_API_OLD_AVIO #if FF_API_OLD_AVIO

14
libavformat/aviobuf.c
Unescape View File

@ -381,6 +381,18 @@ int url_setbufsize(AVIOContext *s, int buf_size)
{ {
return ffio_set_buf_size(s, buf_size); return ffio_set_buf_size(s, buf_size);
} }
int url_fprintf(AVIOContext *s, const char *fmt, ...)
{
va_list ap;
char buf[4096];
int ret;
va_start(ap, fmt);
ret = vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap);
avio_write(s, buf, strlen(buf));
return ret;
}
#endif #endif
int avio_put_str(AVIOContext *s, const char *str) int avio_put_str(AVIOContext *s, const char *str)
@ -913,7 +925,7 @@ URLContext *url_fileno(AVIOContext *s)
} }
#if CONFIG_MUXERS #if CONFIG_MUXERS
int url_fprintf(AVIOContext *s, const char *fmt, ...) int avio_printf(AVIOContext *s, const char *fmt, ...)
{ {
va_list ap; va_list ap;
char buf[4096]; char buf[4096];

6
libavformat/ffmetaenc.c
Unescape View File

@ -73,9 +73,9 @@ static int write_trailer(AVFormatContext *s)
AVChapter *ch = s->chapters[i]; AVChapter *ch = s->chapters[i];
avio_write(s->pb, ID_CHAPTER, sizeof(ID_CHAPTER) - 1); avio_write(s->pb, ID_CHAPTER, sizeof(ID_CHAPTER) - 1);
avio_w8(s->pb, '\n'); avio_w8(s->pb, '\n');
url_fprintf(s->pb, "TIMEBASE=%d/%d\n", ch->time_base.num, ch->time_base.den); avio_printf(s->pb, "TIMEBASE=%d/%d\n", ch->time_base.num, ch->time_base.den);
url_fprintf(s->pb, "START=%"PRId64"\n", ch->start); avio_printf(s->pb, "START=%"PRId64"\n", ch->start);
url_fprintf(s->pb, "END=%"PRId64"\n", ch->end); avio_printf(s->pb, "END=%"PRId64"\n", ch->end);
write_tags(s->pb, ch->metadata); write_tags(s->pb, ch->metadata);
} }

Write Preview
Loading…
Cancel
Save