RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-25 16:21:13 +00:00
Code Issues Projects Releases Wiki Activity

http: move chunk handling from http_read_stream() to http_buf_read().

Browse Source 
(cherry picked from commit 845bb40178)
This commit is contained in:
Ronald S. Bultje 2016-12-05 10:18:10 -05:00
parent 0e0a413725
commit e5be73e178
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
libavformat/http.c
View File

@ -1168,6 +1168,34 @@ static int http_buf_read(URLContext *h, uint8_t *buf, int size)
{ {
HTTPContext *s = h->priv_data; HTTPContext *s = h->priv_data;
int len; int len;
if (s->chunksize != UINT64_MAX) {
if (!s->chunksize) {
char line[32];
int err;
do {
if ((err = http_get_line(s, line, sizeof(line))) < 0)
return err;
} while (!*line); /* skip CR LF from last chunk */
s->chunksize = strtoull(line, NULL, 16);
av_log(h, AV_LOG_TRACE,
"Chunked encoding data size: %"PRIu64"'\n",
s->chunksize);
if (!s->chunksize)
return 0;
else if (s->chunksize == UINT64_MAX) {
av_log(h, AV_LOG_ERROR, "Invalid chunk size %"PRIu64"\n",
s->chunksize);
return AVERROR(EINVAL);
}
}
size = FFMIN(size, s->chunksize);
}
/* read bytes from input buffer first */ /* read bytes from input buffer first */
len = s->buf_end - s->buf_ptr; len = s->buf_end - s->buf_ptr;
if (len > 0) { if (len > 0) {
@ -1190,9 +1218,11 @@ static int http_buf_read(URLContext *h, uint8_t *buf, int size)
} }
if (len > 0) { if (len > 0) {
s->off += len; s->off += len;
if (s->chunksize > 0) if (s->chunksize > 0) {
av_assert0(s->chunksize >= len);
s->chunksize -= len; s->chunksize -= len;
} }
}
return len; return len;
} }
@ -1246,31 +1276,6 @@ static int http_read_stream(URLContext *h, uint8_t *buf, int size)
return err; return err;
} }
if (s->chunksize != UINT64_MAX) {
if (!s->chunksize) {
char line[32];
do {
if ((err = http_get_line(s, line, sizeof(line))) < 0)
return err;
} while (!*line); /* skip CR LF from last chunk */
s->chunksize = strtoull(line, NULL, 16);
av_log(h, AV_LOG_TRACE,
"Chunked encoding data size: %"PRIu64"'\n",
s->chunksize);
if (!s->chunksize)
return 0;
else if (s->chunksize == UINT64_MAX) {
av_log(h, AV_LOG_ERROR, "Invalid chunk size %"PRIu64"\n",
s->chunksize);
return AVERROR(EINVAL);
}
}
size = FFMIN(size, s->chunksize);
}
#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);