RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/dashdec: remove redundant code 

Signed-off-by: Steven Liu <lq@onvideo.cn>
This commit is contained in:
Steven Liu 2018-09-05 14:16:29 +08:00
parent e134c20374
commit 28578e6143
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/dashdec.c
View File

@ -1568,14 +1568,8 @@ static struct fragment *get_current_fragment(struct representation *pls)
return seg; return seg;
} }
enum ReadFromURLMode {
READ_NORMAL,
READ_COMPLETE,
};
static int read_from_url(struct representation *pls, struct fragment *seg, static int read_from_url(struct representation *pls, struct fragment *seg,
uint8_t *buf, int buf_size, uint8_t *buf, int buf_size)
enum ReadFromURLMode mode)
{ {
int ret; int ret;
@ -1583,14 +1577,7 @@ static int read_from_url(struct representation *pls, struct fragment *seg,
if (seg->size >= 0) if (seg->size >= 0)
buf_size = FFMIN(buf_size, pls->cur_seg_size - pls->cur_seg_offset); 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); 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) if (ret > 0)
pls->cur_seg_offset += ret; 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); 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, 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); ff_format_io_close(pls->parent, &pls->input);
if (ret < 0) if (ret < 0)
@ -1737,7 +1724,7 @@ restart:
ret = AVERROR_EOF; ret = AVERROR_EOF;
goto end; 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) if (ret > 0)
goto end; goto end;