xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-27 13:30:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avformat/hlsplaylist: Audio rendition's name and defaultness made configurable

Browse Source 
Reviewed-by: Steven Liu <lq@chinaffmpeg.org>
This commit is contained in:
Karthick Jeyapal 2017-12-29 13:47:12 +08:00 committed by Steven Liu
parent 9e25fe4204
commit 8fd2bdd072
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/hlsenc.c
View File

@ -1169,7 +1169,7 @@ static int create_master_playlist(AVFormatContext *s,
goto fail;
}
ff_hls_write_audio_rendition(hls->m3u8_out, vs->agroup, m3u8_rel_name);
ff_hls_write_audio_rendition(hls->m3u8_out, vs->agroup, m3u8_rel_name, 0, 1);
av_freep(&m3u8_rel_name);
}

5
libavformat/hlsplaylist.c
View File

@ -36,12 +36,13 @@ void ff_hls_write_playlist_version(AVIOContext *out, int version) {
}
void ff_hls_write_audio_rendition(AVIOContext *out, char *agroup,
char *filename) {
char *filename, int name_id, int is_default) {
if (!out || !agroup || !filename)
return;
avio_printf(out, "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"group_%s\"", agroup);
avio_printf(out, ",NAME=\"audio_0\",DEFAULT=YES,URI=\"%s\"\n", filename);
avio_printf(out, ",NAME=\"audio_%d\",DEFAULT=%s,URI=\"%s\"\n", name_id,
is_default ? "YES" : "NO", filename);
}
void ff_hls_write_stream_info(AVStream *st, AVIOContext *out,

3
libavformat/hlsplaylist.h
View File

@ -37,7 +37,8 @@ typedef enum {
} PlaylistType;
void ff_hls_write_playlist_version(AVIOContext *out, int version);
void ff_hls_write_audio_rendition(AVIOContext *out, char *agroup, char *filename);
void ff_hls_write_audio_rendition(AVIOContext *out, char *agroup,
char *filename, int name_id, int is_default);
void ff_hls_write_stream_info(AVStream *st, AVIOContext *out,
int bandwidth, char *filename, char *agroup);
void ff_hls_write_playlist_header(AVIOContext *out, int version, int allowcache,