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

avformat/hls: factor identical playlist allocations out of parse_playlist 

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
This commit is contained in:
Anssi Hannula 2014-01-03 09:47:26 +02:00
parent 6b4b73e75d
commit 05ce529a59
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libavformat/hls.c
View File

@ -465,6 +465,22 @@ static void handle_rendition_args(struct rendition_info *info, const char *key,
*/ */
} }
/* used by parse_playlist to allocate a new variant+playlist when the
* playlist is detected to be a Media Playlist (not Master Playlist)
* and we have no parent Master Playlist (parsing of which would have
* allocated the variant and playlist already) */
static int ensure_playlist(HLSContext *c, struct playlist **pls, const char *url)
{
if (*pls)
return 0;
if (!new_variant(c, NULL, url, NULL))
return AVERROR(ENOMEM);
*pls = c->playlists[c->n_playlists - 1];
return 0;
}
/* pls = NULL => Master Playlist or parentless Media Playlist
* pls = !NULL => parented Media Playlist, playlist+variant allocated */
static int parse_playlist(HLSContext *c, const char *url, static int parse_playlist(HLSContext *c, const char *url,
struct playlist *pls, AVIOContext *in) struct playlist *pls, AVIOContext *in)
{ {
@ -539,22 +555,14 @@ static int parse_playlist(HLSContext *c, const char *url,
&info); &info);
new_rendition(c, &info, url); new_rendition(c, &info, url);
} else if (av_strstart(line, "#EXT-X-TARGETDURATION:", &ptr)) { } else if (av_strstart(line, "#EXT-X-TARGETDURATION:", &ptr)) {
if (!pls) { ret = ensure_playlist(c, &pls, url);
if (!new_variant(c, NULL, url, NULL)) { if (ret < 0)
ret = AVERROR(ENOMEM); goto fail;
goto fail;
}
pls = c->playlists[c->n_playlists - 1];
}
pls->target_duration = atoi(ptr) * AV_TIME_BASE; pls->target_duration = atoi(ptr) * AV_TIME_BASE;
} else if (av_strstart(line, "#EXT-X-MEDIA-SEQUENCE:", &ptr)) { } else if (av_strstart(line, "#EXT-X-MEDIA-SEQUENCE:", &ptr)) {
if (!pls) { ret = ensure_playlist(c, &pls, url);
if (!new_variant(c, NULL, url, NULL)) { if (ret < 0)
ret = AVERROR(ENOMEM); goto fail;
goto fail;
}
pls = c->playlists[c->n_playlists - 1];
}
pls->start_seq_no = atoi(ptr); pls->start_seq_no = atoi(ptr);
} else if (av_strstart(line, "#EXT-X-ENDLIST", &ptr)) { } else if (av_strstart(line, "#EXT-X-ENDLIST", &ptr)) {
if (pls) if (pls)