highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uniformize log messages and add some more

Browse Source 
Originally committed as revision 18059 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-03-20 01:05:51 +00:00
parent 042819c520
commit 77553ae360
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ffserver.c
View File

@ -1264,7 +1264,7 @@ static int http_parse_request(HTTPContext *c)
av_strlcpy(c->protocol, protocol, sizeof(c->protocol)); av_strlcpy(c->protocol, protocol, sizeof(c->protocol));
if (ffserver_debug) if (ffserver_debug)
http_log("New connection: %s %s\n", cmd, url); http_log("%s - - New connection: %s %s\n", inet_ntoa(c->from_addr.sin_addr), cmd, url);
/* find the filename and the optional info string in the request */ /* find the filename and the optional info string in the request */
p = strchr(url, '?'); p = strchr(url, '?');
@ -1321,6 +1321,7 @@ static int http_parse_request(HTTPContext *c)
} }
if (stream == NULL) { if (stream == NULL) {
snprintf(msg, sizeof(msg), "File '%s' not found", url); snprintf(msg, sizeof(msg), "File '%s' not found", url);
http_log("File '%s' not found\n", url);
goto send_error; goto send_error;
} }
@ -1362,7 +1363,7 @@ static int http_parse_request(HTTPContext *c)
/* If already streaming this feed, do not let start another feeder. */ /* If already streaming this feed, do not let start another feeder. */
if (stream->feed_opened) { if (stream->feed_opened) {
snprintf(msg, sizeof(msg), "This feed is already being received."); snprintf(msg, sizeof(msg), "This feed is already being received.");
http_log("feed %s already being received\n", stream->feed_filename); http_log("Feed '%s' already being received\n", stream->feed_filename);
goto send_error; goto send_error;
} }
@ -2514,6 +2515,8 @@ static int http_receive_data(HTTPContext *c)
if (s->nb_streams != feed->nb_streams) { if (s->nb_streams != feed->nb_streams) {
av_close_input_stream(s); av_close_input_stream(s);
av_free(pb); av_free(pb);
http_log("Feed '%s' stream number does not match registered feed\n",
c->stream->feed_filename);
goto fail; goto fail;
} }
@ -3381,9 +3384,10 @@ static void build_file_streams(void)
stream->ap_in->mpeg2ts_compute_pcr = 1; stream->ap_in->mpeg2ts_compute_pcr = 1;
} }
http_log("Opening file '%s'\n", stream->feed_filename);
if ((ret = av_open_input_file(&infile, stream->feed_filename, if ((ret = av_open_input_file(&infile, stream->feed_filename,
stream->ifmt, 0, stream->ap_in)) < 0) { stream->ifmt, 0, stream->ap_in)) < 0) {
http_log("could not open %s: %d\n", stream->feed_filename, ret); http_log("Could not open '%s': %d\n", stream->feed_filename, ret);
/* remove stream (no need to spend more time on it) */ /* remove stream (no need to spend more time on it) */
fail: fail:
remove_stream(stream); remove_stream(stream);