aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Liu <lq@chinaffmpeg.org>2018-09-05 14:16:29 +0800
committerSteven Liu <lq@chinaffmpeg.org>2018-09-05 14:16:29 +0800
commit28578e61431b8cb9783d80f2ff5aa0cd69ae35b9 (patch)
treeb60065c4b0fe86cce7e2679fbf306bf80ae18682
parente134c20374ee3cbc6d04885d306b02c9871683a2 (diff)
downloadffmpeg-28578e61431b8cb9783d80f2ff5aa0cd69ae35b9.tar.gz
avformat/dashdec: remove redundant code
Signed-off-by: Steven Liu <lq@onvideo.cn>
-rw-r--r--libavformat/dashdec.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
index ad60d2ab6f..6aa4d53ff0 100644
--- a/libavformat/dashdec.c
+++ b/libavformat/dashdec.c
@@ -1568,14 +1568,8 @@ static struct fragment *get_current_fragment(struct representation *pls)
return seg;
}
-enum ReadFromURLMode {
- READ_NORMAL,
- READ_COMPLETE,
-};
-
static int read_from_url(struct representation *pls, struct fragment *seg,
- uint8_t *buf, int buf_size,
- enum ReadFromURLMode mode)
+ uint8_t *buf, int buf_size)
{
int ret;
@@ -1583,14 +1577,7 @@ static int read_from_url(struct representation *pls, struct fragment *seg,
if (seg->size >= 0)
buf_size = FFMIN(buf_size, pls->cur_seg_size - pls->cur_seg_offset);
- if (mode == READ_COMPLETE) {
- ret = avio_read(pls->input, buf, buf_size);
- if (ret < buf_size) {
- av_log(pls->parent, AV_LOG_WARNING, "Could not read complete fragment.\n");
- }
- } else {
ret = avio_read(pls->input, buf, buf_size);
- }
if (ret > 0)
pls->cur_seg_offset += ret;
@@ -1666,7 +1653,7 @@ static int update_init_section(struct representation *pls)
av_fast_malloc(&pls->init_sec_buf, &pls->init_sec_buf_size, sec_size);
ret = read_from_url(pls, pls->init_section, pls->init_sec_buf,
- pls->init_sec_buf_size, READ_COMPLETE);
+ pls->init_sec_buf_size);
ff_format_io_close(pls->parent, &pls->input);
if (ret < 0)
@@ -1737,7 +1724,7 @@ restart:
ret = AVERROR_EOF;
goto end;
}
- ret = read_from_url(v, v->cur_seg, buf, buf_size, READ_NORMAL);
+ ret = read_from_url(v, v->cur_seg, buf, buf_size);
if (ret > 0)
goto end;