virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avformat/hlsenc: fix hls_ts_options with mpegts

Browse Source 
Was broken since cdbf8847ea.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2019-12-23 01:27:38 +01:00
parent c044ac2071
commit 73aab08d9d
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libavformat/hlsenc.c
View File

@ -764,6 +764,7 @@ static int hls_mux_init(AVFormatContext *s, VariantStream *vs)
AVFormatContext *oc; AVFormatContext *oc;
AVFormatContext *vtt_oc = NULL; AVFormatContext *vtt_oc = NULL;
int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0); int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0);
int remaining_options;
int i, ret; int i, ret;
ret = avformat_alloc_output_context2(&vs->avf, vs->oformat, NULL, NULL); ret = avformat_alloc_output_context2(&vs->avf, vs->oformat, NULL, NULL);
@ -852,21 +853,25 @@ static int hls_mux_init(AVFormatContext *s, VariantStream *vs)
return ret; return ret;
} }
av_dict_copy(&options, hls->format_options, 0);
if (hls->segment_type == SEGMENT_TYPE_FMP4) { if (hls->segment_type == SEGMENT_TYPE_FMP4) {
int remaining_options;
av_dict_copy(&options, hls->format_options, 0);
av_dict_set(&options, "fflags", "-autobsf", 0); av_dict_set(&options, "fflags", "-autobsf", 0);
av_dict_set(&options, "movflags", "+frag_custom+dash+delay_moov", AV_DICT_APPEND); av_dict_set(&options, "movflags", "+frag_custom+dash+delay_moov", AV_DICT_APPEND);
ret = avformat_init_output(oc, &options); } else {
remaining_options = av_dict_count(options); /* We only require one PAT/PMT per segment. */
av_dict_free(&options); char period[21];
if (ret < 0) snprintf(period, sizeof(period), "%d", (INT_MAX / 2) - 1);
return ret; av_dict_set(&options, "sdt_period", period, 0);
if (remaining_options) { av_dict_set(&options, "pat_period", period, 0);
av_log(s, AV_LOG_ERROR, "Some of the provided format options are not recognized\n"); }
return AVERROR(EINVAL); ret = avformat_init_output(oc, &options);
} remaining_options = av_dict_count(options);
av_dict_free(&options);
if (ret < 0)
return ret;
if (remaining_options) {
av_log(s, AV_LOG_ERROR, "Some of the provided format options are not recognized\n");
return AVERROR(EINVAL);
} }
avio_flush(oc->pb); avio_flush(oc->pb);
return 0; return 0;
@ -1683,15 +1688,8 @@ static int hls_start(AVFormatContext *s, VariantStream *vs)
} }
} }
if (c->segment_type != SEGMENT_TYPE_FMP4) { if (c->segment_type != SEGMENT_TYPE_FMP4) {
/* We only require one PAT/PMT per segment. */
if (oc->oformat->priv_class && oc->priv_data) { if (oc->oformat->priv_class && oc->priv_data) {
char period[21];
snprintf(period, sizeof(period), "%d", (INT_MAX / 2) - 1);
av_opt_set(oc->priv_data, "mpegts_flags", "resend_headers", 0); av_opt_set(oc->priv_data, "mpegts_flags", "resend_headers", 0);
av_opt_set(oc->priv_data, "sdt_period", period, 0);
av_opt_set(oc->priv_data, "pat_period", period, 0);
} }
if (c->flags & HLS_SINGLE_FILE) { if (c->flags & HLS_SINGLE_FILE) {
set_http_options(s, &options, c); set_http_options(s, &options, c);