virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785'

Browse Source 
* commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785':
  http: K&R formatting cosmetics

Conflicts:
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-24 02:08:14 +02:00
commit 8b59ab1af0
1 changed files with 118 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
libavformat/http.c
View File

@ -19,27 +19,29 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/avstring.h" #include "config.h"
#include "avformat.h"
#include "internal.h"
#include "network.h"
#include "http.h"
#include "os_support.h"
#include "httpauth.h"
#include "url.h"
#include "libavutil/opt.h"
#if CONFIG_ZLIB #if CONFIG_ZLIB
#include <zlib.h> #include <zlib.h>
#endif #endif /* CONFIG_ZLIB */
#include "libavutil/avstring.h"
#include "libavutil/opt.h"
#include "avformat.h"
#include "http.h"
#include "httpauth.h"
#include "internal.h"
#include "network.h"
#include "os_support.h"
#include "url.h"
/* XXX: POST protocol is not completely implemented because ffmpeg uses /* XXX: POST protocol is not completely implemented because ffmpeg uses
only a subset of it. */ * only a subset of it. */
/* The IO buffer size is unrelated to the max URL size in itself, but needs /* The IO buffer size is unrelated to the max URL size in itself, but needs
* to be large enough to fit the full request headers (including long * to be large enough to fit the full request headers (including long
* path names). * path names). */
*/
#define BUFFER_SIZE MAX_URL_SIZE #define BUFFER_SIZE MAX_URL_SIZE
#define MAX_REDIRECTS 8 #define MAX_REDIRECTS 8
@ -86,7 +88,7 @@ typedef struct {
int compressed; int compressed;
z_stream inflate_stream; z_stream inflate_stream;
uint8_t *inflate_buffer; uint8_t *inflate_buffer;
#endif #endif /* CONFIG_ZLIB */
AVDictionary *chained_options; AVDictionary *chained_options;
int send_expect_100; int send_expect_100;
char *method; char *method;
@ -96,6 +98,7 @@ typedef struct {
#define D AV_OPT_FLAG_DECODING_PARAM #define D AV_OPT_FLAG_DECODING_PARAM
#define E AV_OPT_FLAG_ENCODING_PARAM #define E AV_OPT_FLAG_ENCODING_PARAM
#define DEFAULT_USER_AGENT "Lavf/" AV_STRINGIFY(LIBAVFORMAT_VERSION) #define DEFAULT_USER_AGENT "Lavf/" AV_STRINGIFY(LIBAVFORMAT_VERSION)
static const AVOption options[] = { static const AVOption options[] = {
{ "seekable", "control seekability of connection", OFFSET(seekable), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, D }, { "seekable", "control seekability of connection", OFFSET(seekable), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, D },
{ "chunked_post", "use chunked transfer-encoding for posts", OFFSET(chunked_post), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, E }, { "chunked_post", "use chunked transfer-encoding for posts", OFFSET(chunked_post), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, E },
@ -117,7 +120,7 @@ static const AVOption options[] = {
{ "location", "The actual location of the data received", OFFSET(location), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D | 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 }, { "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(end_off), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, D }, { "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, }, { "method", "Override the HTTP method", OFFSET(method), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
{ NULL } { NULL }
}; };
@ -128,7 +131,8 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
void ff_http_init_auth_state(URLContext *dest, const URLContext *src) void ff_http_init_auth_state(URLContext *dest, const URLContext *src)
{ {
memcpy(&((HTTPContext *)dest->priv_data)->auth_state, memcpy(&((HTTPContext *)dest->priv_data)->auth_state,
&((HTTPContext*)src->priv_data)->auth_state, sizeof(HTTPAuthState)); &((HTTPContext *)src->priv_data)->auth_state,
sizeof(HTTPAuthState));
memcpy(&((HTTPContext *)dest->priv_data)->proxy_auth_state, memcpy(&((HTTPContext *)dest->priv_data)->proxy_auth_state,
&((HTTPContext *)src->priv_data)->proxy_auth_state, &((HTTPContext *)src->priv_data)->proxy_auth_state,
sizeof(HTTPAuthState)); sizeof(HTTPAuthState));
@ -193,7 +197,8 @@ static int http_open_cnx(URLContext *h, AVDictionary **options)
cur_auth_type = s->auth_state.auth_type; cur_auth_type = s->auth_state.auth_type;
cur_proxy_auth_type = s->auth_state.auth_type; cur_proxy_auth_type = s->auth_state.auth_type;
if (http_connect(h, path, local_path, hoststr, auth, proxyauth, &location_changed) < 0) if (http_connect(h, path, local_path, hoststr,
auth, proxyauth, &location_changed) < 0)
goto fail; goto fail;
attempts++; attempts++;
if (s->http_code == 401) { if (s->http_code == 401) {
@ -212,8 +217,9 @@ static int http_open_cnx(URLContext *h, AVDictionary **options)
} else } else
goto fail; goto fail;
} }
if ((s->http_code == 301 || s->http_code == 302 || s->http_code == 303 || s->http_code == 307) if ((s->http_code == 301 || s->http_code == 302 ||
&& location_changed == 1) { s->http_code == 303 || s->http_code == 307) &&
location_changed == 1) {
/* url moved, get next */ /* url moved, get next */
ffurl_closep(&s->hd); ffurl_closep(&s->hd);
if (redirects++ >= MAX_REDIRECTS) if (redirects++ >= MAX_REDIRECTS)
@ -226,6 +232,7 @@ static int http_open_cnx(URLContext *h, AVDictionary **options)
goto redo; goto redo;
} }
return 0; return 0;
fail: fail:
if (s->hd) if (s->hd)
ffurl_closep(&s->hd); ffurl_closep(&s->hd);
@ -272,7 +279,8 @@ static int http_open(URLContext *h, const char *uri, int flags,
if (s->headers) { if (s->headers) {
int len = strlen(s->headers); int len = strlen(s->headers);
if (len < 2 || strcmp("\r\n", s->headers + len - 2)) if (len < 2 || strcmp("\r\n", s->headers + len - 2))
av_log(h, AV_LOG_WARNING, "No trailing CRLF found in HTTP header.\n"); av_log(h, AV_LOG_WARNING,
"No trailing CRLF found in HTTP header.\n");
} }
ret = http_open_cnx(h, options); ret = http_open_cnx(h, options);
@ -280,6 +288,7 @@ static int http_open(URLContext *h, const char *uri, int flags,
av_dict_free(&s->chained_options); av_dict_free(&s->chained_options);
return ret; return ret;
} }
static int http_getc(HTTPContext *s) static int http_getc(HTTPContext *s)
{ {
int len; int len;
@ -388,7 +397,7 @@ static int parse_content_encoding(URLContext *h, const char *p)
av_log(h, AV_LOG_WARNING, av_log(h, AV_LOG_WARNING,
"Compressed (%s) content, need zlib with gzip support\n", p); "Compressed (%s) content, need zlib with gzip support\n", p);
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
#endif #endif /* CONFIG_ZLIB */
} else if (!av_strncasecmp(p, "identity", 8)) { } else if (!av_strncasecmp(p, "identity", 8)) {
// The normal, no-encoding case (although servers shouldn't include // The normal, no-encoding case (although servers shouldn't include
// the header at all if this is the case). // the header at all if this is the case).
@ -665,7 +674,6 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
const char *method; const char *method;
int send_expect_100 = 0; int send_expect_100 = 0;
/* send http header */ /* send http header */
post = h->flags & AVIO_FLAG_WRITE; post = h->flags & AVIO_FLAG_WRITE;
@ -681,8 +689,8 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
else else
method = post ? "POST" : "GET"; method = post ? "POST" : "GET";
authstr = ff_http_auth_create_response(&s->auth_state, auth, local_path, authstr = ff_http_auth_create_response(&s->auth_state, auth,
method); local_path, method);
proxyauthstr = ff_http_auth_create_response(&s->proxy_auth_state, proxyauth, proxyauthstr = ff_http_auth_create_response(&s->proxy_auth_state, proxyauth,
local_path, method); local_path, method);
if (post && !s->post_data) { if (post && !s->post_data) {
@ -721,14 +729,13 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
"Expect: 100-continue\r\n"); "Expect: 100-continue\r\n");
if (!has_header(s->headers, "\r\nConnection: ")) { if (!has_header(s->headers, "\r\nConnection: ")) {
if (s->multiple_requests) { if (s->multiple_requests)
len += av_strlcpy(headers + len, "Connection: keep-alive\r\n", len += av_strlcpy(headers + len, "Connection: keep-alive\r\n",
sizeof(headers) - len); sizeof(headers) - len);
} else { else
len += av_strlcpy(headers + len, "Connection: close\r\n", len += av_strlcpy(headers + len, "Connection: close\r\n",
sizeof(headers) - len); sizeof(headers) - len);
} }
}
if (!has_header(s->headers, "\r\nHost: ")) if (!has_header(s->headers, "\r\nHost: "))
len += av_strlcatf(headers + len, sizeof(headers) - len, len += av_strlcatf(headers + len, sizeof(headers) - len,
@ -748,10 +755,9 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
av_free(cookies); av_free(cookies);
} }
} }
if (!has_header(s->headers, "\r\nIcy-MetaData: ") && s->icy) { if (!has_header(s->headers, "\r\nIcy-MetaData: ") && s->icy)
len += av_strlcatf(headers + len, sizeof(headers) - len, len += av_strlcatf(headers + len, sizeof(headers) - len,
"Icy-MetaData: %d\r\n", 1); "Icy-MetaData: %d\r\n", 1);
}
/* now add in custom headers */ /* now add in custom headers */
if (s->headers) if (s->headers)
@ -811,7 +817,6 @@ done:
return err; return err;
} }
static int http_buf_read(URLContext *h, uint8_t *buf, int size) static int http_buf_read(URLContext *h, uint8_t *buf, int size)
{ {
HTTPContext *s = h->priv_data; HTTPContext *s = h->priv_data;
@ -862,11 +867,12 @@ static int http_buf_read_compressed(URLContext *h, uint8_t *buf, int size)
ret = inflate(&s->inflate_stream, Z_SYNC_FLUSH); ret = inflate(&s->inflate_stream, Z_SYNC_FLUSH);
if (ret != Z_OK && ret != Z_STREAM_END) if (ret != Z_OK && ret != Z_STREAM_END)
av_log(h, AV_LOG_WARNING, "inflate return value: %d, %s\n", ret, s->inflate_stream.msg); av_log(h, AV_LOG_WARNING, "inflate return value: %d, %s\n",
ret, s->inflate_stream.msg);
return size - s->inflate_stream.avail_out; return size - s->inflate_stream.avail_out;
} }
#endif #endif /* CONFIG_ZLIB */
static int http_read_stream(URLContext *h, uint8_t *buf, int size) static int http_read_stream(URLContext *h, uint8_t *buf, int size)
{ {
@ -893,7 +899,8 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size)
s->chunksize = strtoll(line, NULL, 16); s->chunksize = strtoll(line, NULL, 16);
av_dlog(NULL, "Chunked encoding data size: %"PRId64"'\n", s->chunksize); av_dlog(NULL, "Chunked encoding data size: %"PRId64"'\n",
s->chunksize);
if (!s->chunksize) if (!s->chunksize)
return 0; return 0;
@ -903,7 +910,7 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size)
#if CONFIG_ZLIB #if CONFIG_ZLIB
if (s->compressed) if (s->compressed)
return http_buf_read_compressed(h, buf, size); return http_buf_read_compressed(h, buf, size);
#endif #endif /* CONFIG_ZLIB */
return http_buf_read(h, buf, size); return http_buf_read(h, buf, size);
} }
@ -931,10 +938,10 @@ static int store_icy(URLContext *h, int size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (!remaining) { if (!remaining) {
// The metadata packet is variable sized. It has a 1 byte header /* The metadata packet is variable sized. It has a 1 byte header
// which sets the length of the packet (divided by 16). If it's 0, * which sets the length of the packet (divided by 16). If it's 0,
// the metadata doesn't change. After the packet, icy_metaint bytes * the metadata doesn't change. After the packet, icy_metaint bytes
// of normal data follow. * of normal data follows. */
uint8_t ch; uint8_t ch;
int len = http_read_stream_all(h, &ch, 1); int len = http_read_stream_all(h, &ch, 1);
if (len < 0) if (len < 0)
@ -1024,12 +1031,11 @@ static int http_close(URLContext *h)
#if CONFIG_ZLIB #if CONFIG_ZLIB
inflateEnd(&s->inflate_stream); inflateEnd(&s->inflate_stream);
av_freep(&s->inflate_buffer); av_freep(&s->inflate_buffer);
#endif #endif /* CONFIG_ZLIB */
if (!s->end_chunked_post) { if (!s->end_chunked_post)
/* Close the write direction by sending the end of chunked encoding. */ /* Close the write direction by sending the end of chunked encoding. */
ret = http_shutdown(h, h->flags); ret = http_shutdown(h, h->flags);
}
if (s->hd) if (s->hd)
ffurl_closep(&s->hd); ffurl_closep(&s->hd);
@ -1085,8 +1091,7 @@ static int64_t http_seek(URLContext *h, int64_t off, int whence)
return off; return off;
} }
static int static int http_get_file_handle(URLContext *h)
http_get_file_handle(URLContext *h)
{ {
HTTPContext *s = h->priv_data; HTTPContext *s = h->priv_data;
return ffurl_get_file_handle(s->hd); return ffurl_get_file_handle(s->hd);
@ -1116,7 +1121,8 @@ URLProtocol ff_http_protocol = {
.priv_data_class = &http_context_class, .priv_data_class = &http_context_class,
.flags = URL_PROTOCOL_FLAG_NETWORK, .flags = URL_PROTOCOL_FLAG_NETWORK,
}; };
#endif #endif /* CONFIG_HTTP_PROTOCOL */
#if CONFIG_HTTPS_PROTOCOL #if CONFIG_HTTPS_PROTOCOL
HTTP_CLASS(https); HTTP_CLASS(https);
@ -1133,7 +1139,7 @@ URLProtocol ff_https_protocol = {
.priv_data_class = &https_context_class, .priv_data_class = &https_context_class,
.flags = URL_PROTOCOL_FLAG_NETWORK, .flags = URL_PROTOCOL_FLAG_NETWORK,
}; };
#endif #endif /* CONFIG_HTTPS_PROTOCOL */
#if CONFIG_HTTPPROXY_PROTOCOL #if CONFIG_HTTPPROXY_PROTOCOL
static int http_proxy_close(URLContext *h) static int http_proxy_close(URLContext *h)
@ -1243,4 +1249,4 @@ URLProtocol ff_httpproxy_protocol = {
.priv_data_size = sizeof(HTTPContext), .priv_data_size = sizeof(HTTPContext),
.flags = URL_PROTOCOL_FLAG_NETWORK, .flags = URL_PROTOCOL_FLAG_NETWORK,
}; };
#endif #endif /* CONFIG_HTTPPROXY_PROTOCOL */