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

lavf/dashenc: Don't put non-mp4 streams in HLS manifests. 

The only native HLS implementation in the wild (Safari browser) doesn't
support WebM. And at least some MSE-based players (e.g. shaka-player)
cannot handle WebM media segments when playing HLS. So just skip non-mp4
streams from HLS manifests. Note that such streams will still be described
by the DASH manifest and therefore consumed by players supporting DASH.
This commit is contained in:
Andrey Semashev 2018-11-28 14:36:08 +03:00 committed by Karthick J
parent 3c7a2a0b92
commit 2a5cf8a241
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

@ -225,6 +225,7 @@ static inline SegmentType select_segment_type(SegmentType segment_type, enum AVC
static int init_segment_types(AVFormatContext *s) static int init_segment_types(AVFormatContext *s)
{ {
DASHContext *c = s->priv_data; DASHContext *c = s->priv_data;
int has_mp4_streams = 0;
for (int i = 0; i < s->nb_streams; ++i) { for (int i = 0; i < s->nb_streams; ++i) {
OutputStream *os = &c->streams[i]; OutputStream *os = &c->streams[i];
SegmentType segment_type = select_segment_type( SegmentType segment_type = select_segment_type(
@ -235,6 +236,12 @@ static int init_segment_types(AVFormatContext *s)
av_log(s, AV_LOG_ERROR, "Could not select DASH segment type for stream %d\n", i); av_log(s, AV_LOG_ERROR, "Could not select DASH segment type for stream %d\n", i);
return AVERROR_MUXER_NOT_FOUND; return AVERROR_MUXER_NOT_FOUND;
} }
has_mp4_streams |= segment_type == SEGMENT_TYPE_MP4;
}
if (c->hls_playlist && !has_mp4_streams) {
av_log(s, AV_LOG_WARNING, "No mp4 streams, disabling HLS manifest generation\n");
c->hls_playlist = 0;
} }
return 0; return 0;
@ -510,7 +517,7 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, AVFormatCont
} }
avio_printf(out, "\t\t\t\t</SegmentList>\n"); avio_printf(out, "\t\t\t\t</SegmentList>\n");
} }
if (c->hls_playlist && start_index < os->nb_segments) if (c->hls_playlist && start_index < os->nb_segments && os->segment_type == SEGMENT_TYPE_MP4)
{ {
int timescale = os->ctx->streams[0]->time_base.den; int timescale = os->ctx->streams[0]->time_base.den;
char temp_filename_hls[1024]; char temp_filename_hls[1024];
@ -944,6 +951,8 @@ static int write_manifest(AVFormatContext *s, int final)
OutputStream *os = &c->streams[i]; OutputStream *os = &c->streams[i];
if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO)
continue; continue;
if (os->segment_type != SEGMENT_TYPE_MP4)
continue;
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_audio_rendition(c->m3u8_out, (char *)audio_group, ff_hls_write_audio_rendition(c->m3u8_out, (char *)audio_group,
playlist_file, i, is_default); playlist_file, i, is_default);
@ -967,6 +976,8 @@ static int write_manifest(AVFormatContext *s, int final)
int stream_bitrate = st->codecpar->bit_rate + os->muxer_overhead; int stream_bitrate = st->codecpar->bit_rate + os->muxer_overhead;
if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO)
continue; continue;
if (os->segment_type != SEGMENT_TYPE_MP4)
continue;
av_strlcpy(codec_str, os->codec_str, sizeof(codec_str)); av_strlcpy(codec_str, os->codec_str, sizeof(codec_str));
if (max_audio_bitrate) { if (max_audio_bitrate) {
agroup = (char *)audio_group; agroup = (char *)audio_group;