virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-08 16:54:03 +02:00
Code Issues Releases Activity

avformat/dashenc: Add CODECS tag to HLS master playlist

Browse Source
This commit is contained in:
Karthick Jeyapal 2018-09-04 13:45:47 +05:30
parent 492b312ddd
commit 606879ec42
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/dashenc.c
View File

@ -864,6 +864,7 @@ static int write_manifest(AVFormatContext *s, int final)
if (c->hls_playlist && !c->master_playlist_created) { if (c->hls_playlist && !c->master_playlist_created) {
char filename_hls[1024]; char filename_hls[1024];
const char *audio_group = "A1"; const char *audio_group = "A1";
char audio_codec_str[128] = "\0";
int is_default = 1; int is_default = 1;
int max_audio_bitrate = 0; int max_audio_bitrate = 0;
@ -895,21 +896,31 @@ static int write_manifest(AVFormatContext *s, int final)
playlist_file, i, is_default); playlist_file, i, is_default);
max_audio_bitrate = FFMAX(st->codecpar->bit_rate + max_audio_bitrate = FFMAX(st->codecpar->bit_rate +
os->muxer_overhead, max_audio_bitrate); os->muxer_overhead, max_audio_bitrate);
if (!av_strnstr(audio_codec_str, os->codec_str, sizeof(audio_codec_str))) {
if (strlen(audio_codec_str))
av_strlcat(audio_codec_str, ",", sizeof(audio_codec_str));
av_strlcat(audio_codec_str, os->codec_str, sizeof(audio_codec_str));
}
is_default = 0; is_default = 0;
} }
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
char playlist_file[64]; char playlist_file[64];
char codec_str[128];
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
OutputStream *os = &c->streams[i]; OutputStream *os = &c->streams[i];
char *agroup = NULL; char *agroup = NULL;
int stream_bitrate = st->codecpar->bit_rate + os->muxer_overhead; int stream_bitrate = st->codecpar->bit_rate + os->muxer_overhead;
av_strlcpy(codec_str, os->codec_str, sizeof(codec_str));
if ((st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && max_audio_bitrate) { if ((st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && max_audio_bitrate) {
agroup = (char *)audio_group; agroup = (char *)audio_group;
stream_bitrate += max_audio_bitrate; stream_bitrate += max_audio_bitrate;
av_strlcat(codec_str, ",", sizeof(codec_str));
av_strlcat(codec_str, audio_codec_str, sizeof(codec_str));
} }
get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i); get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i);
ff_hls_write_stream_info(st, out, stream_bitrate, playlist_file, agroup, NULL, NULL); ff_hls_write_stream_info(st, out, stream_bitrate, playlist_file, agroup,
codec_str, NULL);
} }
avio_close(out); avio_close(out);
if (use_rename) if (use_rename)