int ret = 0;
int segment_cnt = 0;
AVBPrint path;
- char *dirname = NULL;
+ const char *dirname = NULL;
char *dirname_r = NULL;
char *dirname_repl = NULL;
- char *vtt_dirname = NULL;
+ const char *vtt_dirname = NULL;
char *vtt_dirname_r = NULL;
const char *proto = NULL;
if (segment && !hls->use_localtime_mkdir) {
dirname_r = hls->segment_filename ? av_strdup(hls->segment_filename): av_strdup(vs->avf->url);
- dirname = (char*)av_dirname(dirname_r);
+ dirname = av_dirname(dirname_r);
}
/* if %v is present in the file's directory
if ((segment->sub_filename[0] != '\0')) {
vtt_dirname_r = av_strdup(vs->vtt_avf->url);
- vtt_dirname = (char*)av_dirname(vtt_dirname_r);
+ vtt_dirname = av_dirname(vtt_dirname_r);
av_bprint_clear(&path);
av_bprintf(&path, "%s%c%s", vtt_dirname, SEPARATOR,
av_dict_copy(&st->metadata, vs->streams[i]->metadata, 0);
}
- vs->packets_written = 1;
vs->start_pos = 0;
vs->new_start = 1;
}
}
- vs->packets_written = 0;
- vs->init_range_length = 0;
-
if ((ret = avio_open_dyn_buf(&oc->pb)) < 0)
return ret;
ff_hls_write_playlist_header(byterange_mode ? hls->m3u8_out : vs->out, hls->version, hls->allowcache,
target_duration, sequence, hls->pl_type, hls->flags & HLS_I_FRAMES_ONLY);
- if ((hls->flags & HLS_DISCONT_START) && sequence==hls->start_sequence && vs->discontinuity_set==0 ) {
+ if ((hls->flags & HLS_DISCONT_START) && sequence==hls->start_sequence && vs->discontinuity_set==0) {
avio_printf(byterange_mode ? hls->m3u8_out : vs->out, "#EXT-X-DISCONTINUITY\n");
vs->discontinuity_set = 1;
}
}
ff_format_set_url(oc, filename);
}
- if ( vs->vtt_basename) {
+ if (vs->vtt_basename) {
char *filename = NULL;
if (replace_int_data_in_filename(&filename,
#if FF_API_HLS_WRAP
ff_format_set_url(vtt_oc, filename);
}
}
- vs->number++;
proto = avio_find_protocol_name(oc->url);
use_temp_file = proto && !strcmp(proto, "file") && (c->flags & HLS_TEMP_FILE);
char *fn_dup = NULL;
int ret = 0;
- if (!fn) {
- ret = AVERROR(EINVAL);
- goto fail;
- }
+ if (!fn)
+ return AVERROR(EINVAL);
fn_dup = av_strdup(fn);
if (!fn_dup)
int ret = 0;
orig_buf_dup = av_strdup(buf);
- if (!orig_buf_dup) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
+ if (!orig_buf_dup)
+ return AVERROR(ENOMEM);
if (!av_stristr(buf, "%v")) {
*s = orig_buf_dup;
- return ret;
+ return 0;
}
if (!varname) {
return AVERROR(EINVAL);
q = varstr;
- while (q < varstr + strlen(varstr)) {
+ while (1) {
if (!av_strncasecmp(q, "a:", 2) || !av_strncasecmp(q, "v:", 2) ||
!av_strncasecmp(q, "s:", 2))
vs->nb_streams++;
+ q = strchr(q, ',');
+ if (!q)
+ break;
q++;
}
vs->streams = av_mallocz(sizeof(AVStream *) * vs->nb_streams);
hls->var_streams[0].nb_streams = s->nb_streams;
hls->var_streams[0].streams = av_mallocz(sizeof(AVStream *) *
hls->var_streams[0].nb_streams);
- if (!hls->var_streams[0].streams) {
+ if (!hls->var_streams[0].streams)
return AVERROR(ENOMEM);
- }
//by default, the first available ccgroup is mapped to the variant stream
if (hls->nb_ccstreams) {
hls->var_streams[0].ccgroup = av_strdup(hls->cc_streams[0].ccgroup);
- if (!hls->var_streams[0].ccgroup) {
+ if (!hls->var_streams[0].ccgroup)
return AVERROR(ENOMEM);
- }
}
for (i = 0; i < s->nb_streams; i++)
vs = &hls->var_streams[i];
for (j = 0; j < vs->nb_streams; j++) {
if (vs->streams[j] == st) {
- if ( st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE ) {
+ if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) {
oc = vs->vtt_avf;
stream_index = 0;
} else {
if (vs->sequence - vs->nb_entries > hls->start_sequence && hls->init_time > 0) {
/* reset end_pts, hls->recording_time at end of the init hls list */
int64_t init_list_dur = hls->init_time * vs->nb_entries * AV_TIME_BASE;
- int64_t after_init_list_dur = (vs->sequence - hls->start_sequence - vs->nb_entries ) * (hls->time * AV_TIME_BASE);
+ int64_t after_init_list_dur = (vs->sequence - hls->start_sequence - vs->nb_entries) * (hls->time * AV_TIME_BASE);
hls->recording_time = hls->time * AV_TIME_BASE;
end_pts = init_list_dur + after_init_list_dur ;
}
if (ret < 0) {
av_log(s, hls->ignore_io_errors ? AV_LOG_WARNING : AV_LOG_ERROR,
"Failed to open file '%s'\n", filename);
+ av_freep(&filename);
av_dict_free(&options);
return hls->ignore_io_errors ? 0 : ret;
}
}
ret = flush_dynbuf(vs, &range_length);
if (ret < 0) {
+ av_freep(&filename);
av_dict_free(&options);
return ret;
}
if ((ret = hls_window(s, 0, vs)) < 0) {
av_log(s, AV_LOG_WARNING, "upload playlist failed, will retry with a new http session.\n");
ff_format_io_close(s, &vs->out);
- vs->out = NULL;
if ((ret = hls_window(s, 0, vs)) < 0) {
av_freep(&old_filename);
return ret;
}
if (hls->flags & HLS_SINGLE_FILE) {
- vs->number++;
vs->start_pos += vs->size;
} else if (hls->max_seg_size > 0) {
vs->start_pos = new_start_pos;
vs->start_pos = 0;
/* When split segment by byte, the duration is short than hls_time,
* so it is not enough one segment duration as hls_time, */
- vs->number--;
}
- vs->number++;
} else {
vs->start_pos = new_start_pos;
sls_flag_file_rename(hls, vs, old_filename);
ret = hls_start(s, vs);
}
+ vs->number++;
av_freep(&old_filename);
if (ret < 0) {
{
HLSContext *hls = s->priv_data;
int i = 0;
- AVFormatContext *vtt_oc = NULL;
VariantStream *vs = NULL;
for (i = 0; i < hls->nb_varstreams; i++) {
vs = &hls->var_streams[i];
- vtt_oc = vs->vtt_avf;
av_freep(&vs->basename);
av_freep(&vs->base_output_dirname);
av_freep(&vs->vtt_basename);
av_freep(&vs->vtt_m3u8_name);
- avformat_free_context(vtt_oc);
+ avformat_free_context(vs->vtt_avf);
avformat_free_context(vs->avf);
if (hls->resend_init_file)
av_freep(&vs->init_buffer);
for (i = 0; i < hls->nb_ccstreams; i++) {
ClosedCaptionsStream *ccs = &hls->cc_streams[i];
+
av_freep(&ccs->ccgroup);
av_freep(&ccs->instreamid);
av_freep(&ccs->language);
return AVERROR(ENOMEM);
}
- if ( hls->segment_type == SEGMENT_TYPE_FMP4) {
+ if (hls->segment_type == SEGMENT_TYPE_FMP4) {
int range_length = 0;
if (!vs->init_range_length) {
uint8_t *buffer = NULL;
if (ret < 0)
av_log(s, AV_LOG_WARNING, "Failed to upload file '%s' at the end.\n", oc->url);
}
- av_freep(&vs->temp_buffer);
failed:
+ av_freep(&vs->temp_buffer);
+ av_dict_free(&options);
av_freep(&filename);
av_write_trailer(oc);
if (oc->url[0]) {
int i = 0;
int j = 0;
HLSContext *hls = s->priv_data;
- const char *pattern = "%d.ts";
+ const char *pattern;
VariantStream *vs = NULL;
- int basename_size = 0;
- const char *pattern_localtime_fmt = get_default_pattern_localtime_fmt(s);
- const char *vtt_pattern = "%d.vtt";
+ const char *vtt_pattern = hls->flags & HLS_SINGLE_FILE ? ".vtt" : "%d.vtt";
char *p = NULL;
- int vtt_basename_size = 0;
int http_base_proto = ff_is_http_proto(s->url);
int fmp4_init_filename_len = strlen(hls->fmp4_init_filename) + 1;
+ if (hls->use_localtime) {
+ pattern = get_default_pattern_localtime_fmt(s);
+ } else {
+ pattern = hls->segment_type == SEGMENT_TYPE_FMP4 ? "%d.m4s" : "%d.ts";
+ if (hls->flags & HLS_SINGLE_FILE)
+ pattern += 2;
+ }
+
hls->has_default_key = 0;
hls->has_video_m3u8 = 0;
ret = update_variant_stream_info(s);
if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Variant stream info update failed with status %x\n",
ret);
- goto fail;
+ return ret;
}
if (!hls->method && http_base_proto) {
ret = validate_name(hls->nb_varstreams, s->url);
if (ret < 0)
- goto fail;
+ return ret;
if (hls->segment_filename) {
ret = validate_name(hls->nb_varstreams, hls->segment_filename);
if (ret < 0)
- goto fail;
+ return ret;
}
if (av_strcasecmp(hls->fmp4_init_filename, "init.mp4")) {
ret = validate_name(hls->nb_varstreams, hls->fmp4_init_filename);
if (ret < 0)
- goto fail;
+ return ret;
}
if (hls->subtitle_filename) {
ret = validate_name(hls->nb_varstreams, hls->subtitle_filename);
if (ret < 0)
- goto fail;
+ return ret;
}
if (hls->master_pl_name) {
if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Master stream info update failed with status %x\n",
ret);
- goto fail;
+ return ret;
}
}
- if (hls->segment_type == SEGMENT_TYPE_FMP4) {
- pattern = "%d.m4s";
- }
if ((hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_SECONDS_SINCE_EPOCH) ||
(hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_MICROSECONDS_SINCE_EPOCH) ||
(hls->start_sequence_source_type == HLS_START_SEQUENCE_AS_FORMATTED_DATETIME)) {
}
hls->recording_time = (hls->init_time ? hls->init_time : hls->time) * AV_TIME_BASE;
+
+ if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) {
+ // Independent segments cannot be guaranteed when splitting by time
+ hls->flags &= ~HLS_INDEPENDENT_SEGMENTS;
+ av_log(s, AV_LOG_WARNING,
+ "'split_by_time' and 'independent_segments' cannot be "
+ "enabled together. Disabling 'independent_segments' flag\n");
+ }
+
for (i = 0; i < hls->nb_varstreams; i++) {
vs = &hls->var_streams[i];
ret = format_name(s->url, &vs->m3u8_name, i, vs->varname);
if (ret < 0)
- goto fail;
+ return ret;
- vs->sequence = hls->start_sequence;
- vs->start_pts = AV_NOPTS_VALUE;
- vs->end_pts = AV_NOPTS_VALUE;
+ vs->sequence = hls->start_sequence;
+ vs->start_pts = AV_NOPTS_VALUE;
+ vs->end_pts = AV_NOPTS_VALUE;
vs->current_segment_final_filename_fmt[0] = '\0';
- if (hls->flags & HLS_SPLIT_BY_TIME && hls->flags & HLS_INDEPENDENT_SEGMENTS) {
- // Independent segments cannot be guaranteed when splitting by time
- hls->flags &= ~HLS_INDEPENDENT_SEGMENTS;
- av_log(s, AV_LOG_WARNING,
- "'split_by_time' and 'independent_segments' cannot be enabled together. "
- "Disabling 'independent_segments' flag\n");
- }
-
if (hls->flags & HLS_PROGRAM_DATE_TIME) {
time_t now0;
time(&now0);
} else {
vs->oformat = av_guess_format("mpegts", NULL, NULL);
}
+ if (!vs->oformat)
+ return AVERROR_MUXER_NOT_FOUND;
- if (!vs->oformat) {
- ret = AVERROR_MUXER_NOT_FOUND;
- goto fail;
- }
-
- if (vs->has_subtitle) {
- vs->vtt_oformat = av_guess_format("webvtt", NULL, NULL);
- if (!vs->vtt_oformat) {
- ret = AVERROR_MUXER_NOT_FOUND;
- goto fail;
- }
- }
if (hls->segment_filename) {
ret = format_name(hls->segment_filename, &vs->basename, i, vs->varname);
if (ret < 0)
- goto fail;
+ return ret;
} else {
- if (hls->flags & HLS_SINGLE_FILE) {
- if (hls->segment_type == SEGMENT_TYPE_FMP4) {
- pattern = ".m4s";
- } else {
- pattern = ".ts";
- }
- }
-
- if (hls->use_localtime) {
- basename_size = strlen(vs->m3u8_name) + strlen(pattern_localtime_fmt) + 1;
- } else {
- basename_size = strlen(vs->m3u8_name) + strlen(pattern) + 1;
- }
-
- vs->basename = av_malloc(basename_size);
- if (!vs->basename) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
+ p = strrchr(vs->m3u8_name, '.');
+ if (p)
+ *p = '\0';
- av_strlcpy(vs->basename, vs->m3u8_name, basename_size);
+ vs->basename = av_asprintf("%s%s", vs->m3u8_name, pattern);
+ if (!vs->basename)
+ return AVERROR(ENOMEM);
- p = strrchr(vs->basename, '.');
if (p)
- *p = '\0';
- if (hls->use_localtime) {
- av_strlcat(vs->basename, pattern_localtime_fmt, basename_size);
- } else {
- av_strlcat(vs->basename, pattern, basename_size);
- }
+ *p = '.';
}
if (hls->segment_type == SEGMENT_TYPE_FMP4) {
fmp4_init_filename_len += strlen(POSTFIX_PATTERN);
if (hls->flags & HLS_SINGLE_FILE) {
vs->fmp4_init_filename = av_strdup(vs->basename);
- if (!vs->fmp4_init_filename) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
+ if (!vs->fmp4_init_filename)
+ return AVERROR(ENOMEM);
} else {
vs->fmp4_init_filename = av_malloc(fmp4_init_filename_len);
- if (!vs->fmp4_init_filename ) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
+ if (!vs->fmp4_init_filename)
+ return AVERROR(ENOMEM);
av_strlcpy(vs->fmp4_init_filename, hls->fmp4_init_filename,
fmp4_init_filename_len);
if (hls->nb_varstreams > 1) {
ret = append_postfix(vs->fmp4_init_filename, fmp4_init_filename_len, i);
}
if (ret < 0)
- goto fail;
+ return ret;
}
- fmp4_init_filename_len = strlen(vs->m3u8_name) +
- strlen(vs->fmp4_init_filename) + 1;
-
- vs->base_output_dirname = av_malloc(fmp4_init_filename_len);
- if (!vs->base_output_dirname) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
-
- av_strlcpy(vs->base_output_dirname, vs->m3u8_name,
- fmp4_init_filename_len);
- p = strrchr(vs->base_output_dirname, '/');
+ p = strrchr(vs->m3u8_name, '/');
if (p) {
- *(p + 1) = '\0';
- av_strlcat(vs->base_output_dirname, vs->fmp4_init_filename,
- fmp4_init_filename_len);
+ char tmp = *(++p);
+ *p = '\0';
+ vs->base_output_dirname = av_asprintf("%s%s", vs->m3u8_name,
+ vs->fmp4_init_filename);
+ *p = tmp;
} else {
- av_strlcpy(vs->base_output_dirname, vs->fmp4_init_filename,
- fmp4_init_filename_len);
+ vs->base_output_dirname = av_strdup(vs->fmp4_init_filename);
}
+ if (!vs->base_output_dirname)
+ return AVERROR(ENOMEM);
}
}
ret = hls->use_localtime ? sls_flag_check_duration_size(hls, vs) : sls_flag_check_duration_size_index(hls);
if (ret < 0)
- goto fail;
+ return ret;
if (vs->has_subtitle) {
+ vs->vtt_oformat = av_guess_format("webvtt", NULL, NULL);
+ if (!vs->vtt_oformat)
+ return AVERROR_MUXER_NOT_FOUND;
- if (hls->flags & HLS_SINGLE_FILE)
- vtt_pattern = ".vtt";
- vtt_basename_size = strlen(vs->m3u8_name) + strlen(vtt_pattern) + 1;
-
- vs->vtt_basename = av_malloc(vtt_basename_size);
- if (!vs->vtt_basename) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
- av_strlcpy(vs->vtt_basename, vs->m3u8_name, vtt_basename_size);
- p = strrchr(vs->vtt_basename, '.');
+ p = strrchr(vs->m3u8_name, '.');
if (p)
*p = '\0';
- if ( hls->subtitle_filename ) {
+ vs->vtt_basename = av_asprintf("%s%s", vs->m3u8_name, vtt_pattern);
+ if (!vs->vtt_basename)
+ return AVERROR(ENOMEM);
+
+ if (hls->subtitle_filename) {
ret = format_name(hls->subtitle_filename, &vs->vtt_m3u8_name, i, vs->varname);
if (ret < 0)
- goto fail;
+ return ret;
} else {
- vs->vtt_m3u8_name = av_asprintf("%s_vtt.m3u8", vs->vtt_basename);
- if (!vs->vtt_m3u8_name) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
+ vs->vtt_m3u8_name = av_asprintf("%s_vtt.m3u8", vs->m3u8_name);
+ if (!vs->vtt_m3u8_name)
+ return AVERROR(ENOMEM);
}
- av_strlcat(vs->vtt_basename, vtt_pattern, vtt_basename_size);
+ if (p)
+ *p = '.';
}
if (hls->baseurl) {
vs->baseurl = av_strdup(hls->baseurl);
- if (!vs->baseurl) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
+ if (!vs->baseurl)
+ return AVERROR(ENOMEM);
}
if ((ret = hls_mux_init(s, vs)) < 0)
- goto fail;
+ return ret;
if (hls->flags & HLS_APPEND_LIST) {
parse_playlist(s, vs->m3u8_name, vs);
}
if ((ret = hls_start(s, vs)) < 0)
- goto fail;
+ return ret;
+ vs->number++;
}
-fail:
return ret;
}
{"independent_segments", "add EXT-X-INDEPENDENT-SEGMENTS, whenever applicable", 0, AV_OPT_TYPE_CONST, { .i64 = HLS_INDEPENDENT_SEGMENTS }, 0, UINT_MAX, E, "flags"},
{"iframes_only", "add EXT-X-I-FRAMES-ONLY, whenever applicable", 0, AV_OPT_TYPE_CONST, { .i64 = HLS_I_FRAMES_ONLY }, 0, UINT_MAX, E, "flags"},
#if FF_API_HLS_USE_LOCALTIME
- {"use_localtime", "set filename expansion with strftime at segment creation(will be deprecated )", OFFSET(use_localtime), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E },
+ {"use_localtime", "set filename expansion with strftime at segment creation(will be deprecated)", OFFSET(use_localtime), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E },
#endif
{"strftime", "set filename expansion with strftime at segment creation", OFFSET(use_localtime), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E },
#if FF_API_HLS_USE_LOCALTIME
projects / ffmpeg / blobdiff