From 6bab3430a775183f2f9acbd91d1376c71e87c026 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Tue, 23 Jul 2013 04:07:10 +0800 Subject: [PATCH] avformat/http: support reading compressed data MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Derived from VLC's http module. Original authors: Antoine Cellerier Sébastien Escudier Rémi Duraffort Rémi Denis-Courmont Francois Cartegnie Signed-off-by: Michael Niedermayer --- libavformat/http.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/libavformat/http.c b/libavformat/http.c index 0c26cd5eab0..7b5b21ca889 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -29,6 +29,10 @@ #include "url.h" #include "libavutil/opt.h" +#if CONFIG_ZLIB +#include +#endif + /* XXX: POST protocol is not completely implemented because ffmpeg uses only a subset of it. */ @@ -70,6 +74,11 @@ typedef struct { int icy; char *icy_metadata_headers; char *icy_metadata_packet; +#if CONFIG_ZLIB + int compressed; + z_stream inflate_stream; + uint8_t *inflate_buffer; +#endif } HTTPContext; #define OFFSET(x) offsetof(HTTPContext, x) @@ -396,6 +405,22 @@ static int process_line(URLContext *h, char *line, int line_count, return AVERROR(ENOMEM); av_freep(&s->icy_metadata_headers); s->icy_metadata_headers = buf; + } else if (!av_strcasecmp (tag, "Content-Encoding")) { + if (!av_strncasecmp(p, "gzip", 4) || !av_strncasecmp(p, "deflate", 7)) { +#if CONFIG_ZLIB + s->compressed = 1; + inflateEnd(&s->inflate_stream); + if (inflateInit2(&s->inflate_stream, 32 + 15) != Z_OK) + av_log(h, AV_LOG_WARNING, "Error during zlib initialisation: %s", + s->inflate_stream.msg); + if (zlibCompileFlags() & (1 << 17)) + av_log(h, AV_LOG_WARNING, "Your zlib was compiled without gzip support."); +#else + av_log(h, AV_LOG_WARNING, "Compressed(%s) content, need zlib support", p); +#endif + } + else + av_log(h, AV_LOG_WARNING, "Unknown content coding: %s", p); } } return 1; @@ -685,6 +710,38 @@ static int http_buf_read(URLContext *h, uint8_t *buf, int size) return len; } +#if CONFIG_ZLIB +#define DECOMPRESS_BUF_SIZE (256 * 1024) +static int http_buf_read_compressed(URLContext *h, uint8_t *buf, int size) +{ + HTTPContext *s = h->priv_data; + int ret; + + if (!s->inflate_buffer) { + s->inflate_buffer = av_malloc(DECOMPRESS_BUF_SIZE); + if (!s->inflate_buffer) + return AVERROR(ENOMEM); + } + + if (s->inflate_stream.avail_in == 0) { + int read = http_buf_read(h, s->inflate_buffer, DECOMPRESS_BUF_SIZE); + if (read <= 0) + return read; + s->inflate_stream.next_in = s->inflate_buffer; + s->inflate_stream.avail_in = read; + } + + s->inflate_stream.avail_out = size; + s->inflate_stream.next_out = buf; + + ret = inflate(&s->inflate_stream, Z_SYNC_FLUSH); + if (ret != Z_OK && ret != Z_STREAM_END) + av_log(h, AV_LOG_WARNING, "inflate return value: %d, %s", ret, s->inflate_stream.msg); + + return size - s->inflate_stream.avail_out; +} +#endif + static int http_read(URLContext *h, uint8_t *buf, int size) { HTTPContext *s = h->priv_data; @@ -746,6 +803,10 @@ static int http_read(URLContext *h, uint8_t *buf, int size) } size = FFMIN(size, remaining); } +#if CONFIG_ZLIB + if (s->compressed) + return http_buf_read_compressed(h, buf, size); +#endif return http_buf_read(h, buf, size); } @@ -797,6 +858,11 @@ static int http_close(URLContext *h) int ret = 0; HTTPContext *s = h->priv_data; +#if CONFIG_ZLIB + inflateEnd(&s->inflate_stream); + av_freep(&s->inflate_buffer); +#endif + if (!s->end_chunked_post) { /* Close the write direction by sending the end of chunked encoding. */ ret = http_shutdown(h, h->flags); -- 2.39.2