On Sun, 29 Mar 2015 04:13:18 +0200
Stephan Holljes <klaxa1...@googlemail.com> wrote:
> I hope this addresses the issues mentioned.
> I added a new label in case of failure in http_open() in favor of
> duplicated code (i.e. calling av_dict_free() multiple times). I copied
> the style from the other functions.
>
> Signed-off-by: Stephan Holljes <klaxa1...@googlemail.com>
> ---
> doc/protocols.texi | 3 +++
> libavformat/http.c | 26 +++++++++++++++++++++++++-
> 2 files changed, 28 insertions(+), 1 deletion(-)
>
> diff --git a/doc/protocols.texi b/doc/protocols.texi
> index 2a19b41..5b7b6cf 100644
> --- a/doc/protocols.texi
> +++ b/doc/protocols.texi
> @@ -277,6 +277,9 @@ Set initial byte offset.
>
> @item end_offset
> Try to limit the request to bytes preceding this offset.
> +
> +@item listen
> +If set to 1 enables experimental HTTP server.
> @end table
>
> @subsection HTTP Cookies
> diff --git a/libavformat/http.c b/libavformat/http.c
> index da3c9be..c769918 100644
> --- a/libavformat/http.c
> +++ b/libavformat/http.c
> @@ -96,6 +96,7 @@ typedef struct HTTPContext {
> int send_expect_100;
> char *method;
> int reconnect;
> + int listen;
> } HTTPContext;
>
> #define OFFSET(x) offsetof(HTTPContext, x)
> @@ -127,6 +128,7 @@ static const AVOption options[] = {
> { "end_offset", "try to limit the request to bytes preceding this
> offset", OFFSET(end_off), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, D },
> { "method", "Override the HTTP method", OFFSET(method),
> AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
> { "reconnect", "auto reconnect after disconnect before EOF",
> OFFSET(reconnect), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, D },
> + { "listen", "listen on HTTP", OFFSET(listen), AV_OPT_TYPE_INT, { .i64 =
> 0 }, 0, 1, E },
> { NULL }
> };
>
> @@ -321,9 +323,31 @@ static int http_open(URLContext *h, const char *uri, int
> flags,
> "No trailing CRLF found in HTTP header.\n");
> }
>
> + if (s->listen) {
> + static const char header[] = "HTTP/1.1 200 OK\r\nContent-Type:
> application/octet-stream\r\nTransfer-Encoding: chunked\r\n\r\n";
> + char hostname[1024];
> + char lower_url[100];
> + int port;
> + av_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port,
> + NULL, 0, uri);
> + ff_url_join(lower_url, sizeof(lower_url), "tcp", NULL, hostname,
> port,
> + NULL);
> + av_dict_set(options, "listen", "1", 0);
> + ret = ffurl_open(&s->hd, lower_url, AVIO_FLAG_READ_WRITE,
> + &h->interrupt_callback, options);
> + if (ret < 0)
> + goto fail;
> + if (ret = ffurl_write(s->hd, header, strlen(header)) < 0)
> + goto fail;
> + return 0;
> + }
> ret = http_open_cnx(h, options);
> if (ret < 0)
> - av_dict_free(&s->chained_options);
> + goto fail;
> + return ret;
> +
> +fail:
> + av_dict_free(&s->chained_options);
> return ret;
> }
>
Maybe this should be in a separate function at least.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
