On 06/03/14 16:11, Alessandro Ghedini wrote:
> Original ffmpeg commit by d52882f Anssi Hannula.
> ---
> doc/protocols.texi | 6 ++++++
> libavformat/http.c | 17 ++++++++++++++---
> 2 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/doc/protocols.texi b/doc/protocols.texi
> index c0785d9..820afcf 100644
> --- a/doc/protocols.texi
> +++ b/doc/protocols.texi
> @@ -114,6 +114,12 @@ If the server supports ICY metadata, and @option{icy}
> was set to 1, this
> contains the last non-empty metadata packet sent by the server. It should be
> polled in regular intervals by applications interested in metadata updates
> mid-stream.
> +
> +@item offset
> +Set initial byte offset.
> +
> +@item end_offset
> +Try to limit the request to bytes preceding this offset.
> @end table
>
> @section mmst
> diff --git a/libavformat/http.c b/libavformat/http.c
> index af5ba9a..86f2c92 100644
> --- a/libavformat/http.c
> +++ b/libavformat/http.c
> @@ -50,8 +50,8 @@ typedef struct {
> int line_count;
> int http_code;
> int64_t chunksize; /**< Used if "Transfer-Encoding: chunked"
> otherwise -1. */
> - int64_t off, filesize;
> char *user_agent;
> + int64_t off, filesize, req_end_offset;
> int icy_data_read; ///< how much data was read since last ICY
> metadata packet
> int icy_metaint; ///< after how many bytes of read data a new
> metadata packet will be found
> char *location;
> @@ -97,6 +97,8 @@ static const AVOption options[] = {
> {"basic", "HTTP basic authentication", 0, AV_OPT_TYPE_CONST, {.i64 =
> HTTP_AUTH_BASIC}, 0, 0, D|E, "auth_type" },
> {"send_expect_100", "Force sending an Expect: 100-continue header for POST",
> OFFSET(send_expect_100), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, E },
> {"location", "The actual location of the data received", OFFSET(location),
> AV_OPT_TYPE_STRING, { 0 }, 0, 0, D|E },
> +{"offset", "initial byte offset", OFFSET(off), AV_OPT_TYPE_INT64, {.i64 =
> 0}, 0, INT64_MAX, D },
> +{"end_offset", "try to limit the request to bytes preceding this offset",
> OFFSET(req_end_offset), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, D },
> {NULL}
> };
> #define HTTP_CLASS(flavor)\
> @@ -513,9 +515,18 @@ static int http_connect(URLContext *h, const char *path,
> const char *local_path,
> if (!has_header(s->headers, "\r\nAccept: "))
> len += av_strlcpy(headers + len, "Accept: */*\r\n",
> sizeof(headers) - len);
> - if (!has_header(s->headers, "\r\nRange: ") && !post)
> + // Note: we send this on purpose even when s->off is 0 when we're
> probing,
> + // since it allows us to detect more reliably if a (non-conforming)
> + // server supports seeking by analysing the reply headers.
Makes sense for probing indeed.
Martin do you have an opinion?
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
