#include "os_support.h"
typedef enum {
- HLS_START_SEQUENCE_AS_START_NUMBER = 0,
- HLS_START_SEQUENCE_AS_SECONDS_SINCE_EPOCH = 1,
- HLS_START_SEQUENCE_AS_FORMATTED_DATETIME = 2, // YYYYMMDDhhmmss
+ HLS_START_SEQUENCE_AS_START_NUMBER = 0,
+ HLS_START_SEQUENCE_AS_SECONDS_SINCE_EPOCH = 1,
+ HLS_START_SEQUENCE_AS_FORMATTED_DATETIME = 2, // YYYYMMDDhhmmss
} StartSequenceSourceType;
typedef enum {
} CodecAttributeStatus;
#define KEYSIZE 16
-#define LINE_BUFFER_SIZE 1024
+#define LINE_BUFFER_SIZE MAX_URL_SIZE
#define HLS_MICROSECOND_UNIT 1000000
#define POSTFIX_PATTERN "_%d"
typedef struct HLSSegment {
- char filename[1024];
- char sub_filename[1024];
+ char filename[MAX_URL_SIZE];
+ char sub_filename[MAX_URL_SIZE];
double duration; /* in seconds */
int discont;
int64_t pos;
AVIOContext *out;
int packets_written;
int init_range_length;
+ uint8_t *temp_buffer;
AVFormatContext *avf;
AVFormatContext *vtt_avf;
char *m3u8_name;
double initial_prog_date_time;
- char current_segment_final_filename_fmt[1024]; // when renaming segments
+ char current_segment_final_filename_fmt[MAX_URL_SIZE]; // when renaming segments
char *fmp4_init_filename;
char *base_output_dirname;
int64_t max_seg_size; // every segment file max size
char *baseurl;
- char *format_options_str;
char *vtt_format_options_str;
char *subtitle_filename;
AVDictionary *format_options;
} HLSContext;
static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename,
- AVDictionary **options) {
+ AVDictionary **options)
+{
HLSContext *hls = s->priv_data;
int http_base_proto = filename ? ff_is_http_proto(filename) : 0;
int err = AVERROR_MUXER_NOT_FOUND;
return err;
}
-static void hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename) {
+static int hlsenc_io_close(AVFormatContext *s, AVIOContext **pb, char *filename)
+{
HLSContext *hls = s->priv_data;
int http_base_proto = filename ? ff_is_http_proto(filename) : 0;
+ int ret = 0;
if (!*pb)
- return;
+ return ret;
if (!http_base_proto || !hls->http_persistent || hls->key_info_file || hls->encrypt) {
ff_format_io_close(s, pb);
#if CONFIG_HTTP_PROTOCOL
av_assert0(http_url_context);
avio_flush(*pb);
ffurl_shutdown(http_url_context, AVIO_FLAG_WRITE);
+ ret = ff_http_get_shutdown_status(http_url_context);
#endif
}
+ return ret;
}
static void set_http_options(AVFormatContext *s, AVDictionary **options, HLSContext *c)
if (c->method) {
av_dict_set(options, "method", c->method, 0);
} else if (http_base_proto) {
- av_log(c, AV_LOG_WARNING, "No HTTP method set, hls muxer defaulting to method PUT.\n");
av_dict_set(options, "method", "PUT", 0);
}
if (c->user_agent)
av_dict_set(options, "headers", c->headers, 0);
}
-static void write_codec_attr(AVStream *st, VariantStream *vs) {
+static void write_codec_attr(AVStream *st, VariantStream *vs)
+{
int codec_strlen = strlen(vs->codec_attr);
char attr[32];
static int flush_dynbuf(VariantStream *vs, int *range_length)
{
AVFormatContext *ctx = vs->avf;
- uint8_t *buffer;
if (!ctx->pb) {
return AVERROR(EINVAL);
// flush
av_write_frame(ctx, NULL);
- avio_flush(ctx->pb);
// write out to file
- *range_length = avio_close_dyn_buf(ctx->pb, &buffer);
+ *range_length = avio_close_dyn_buf(ctx->pb, &vs->temp_buffer);
ctx->pb = NULL;
- avio_write(vs->out, buffer, *range_length);
- av_free(buffer);
+ avio_write(vs->out, vs->temp_buffer, *range_length);
+ avio_flush(vs->out);
// re-open buffer
return avio_open_dyn_buf(&ctx->pb);
}
+static void reflush_dynbuf(VariantStream *vs, int *range_length)
+{
+ // re-open buffer
+ avio_write(vs->out, vs->temp_buffer, *range_length);
+}
+
+#if HAVE_DOS_PATHS
+#define SEPARATOR '\\'
+#else
+#define SEPARATOR '/'
+#endif
+
static int hls_delete_old_segments(AVFormatContext *s, HLSContext *hls,
- VariantStream *vs) {
+ VariantStream *vs)
+{
HLSSegment *segment, *previous_segment = NULL;
float playlist_duration = 0.0f;
int ret = 0, path_size, sub_path_size;
int segment_cnt = 0;
- char *dirname = NULL, *p, *sub_path;
+ char *dirname = NULL, *sub_path;
+ char *dirname_r = NULL;
+ char *dirname_repl = NULL;
char *path = NULL;
char *vtt_dirname = NULL;
+ char *vtt_dirname_r = NULL;
AVDictionary *options = NULL;
AVIOContext *out = NULL;
const char *proto = NULL;
}
if (segment && !hls->use_localtime_mkdir) {
- if (hls->segment_filename) {
- dirname = av_strdup(hls->segment_filename);
- } else {
- dirname = av_strdup(vs->avf->url);
- }
- if (!dirname) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
- p = (char *)av_basename(dirname);
- *p = '\0';
-
+ dirname_r = hls->segment_filename ? av_strdup(hls->segment_filename): av_strdup(vs->avf->url);
+ dirname = (char*)av_dirname(dirname_r);
}
/* if %v is present in the file's directory
* all segment belongs to the same variant, so do it only once before the loop*/
if (dirname && av_stristr(dirname, "%v")) {
- char * r_dirname = dirname;
+ char * dirname_repl = dirname;
if (!vs->varname) {
- if (replace_int_data_in_filename(&r_dirname, dirname, 'v', segment->var_stream_idx) < 1) {
+ if (replace_int_data_in_filename(&dirname_repl, dirname, 'v', segment->var_stream_idx) < 1) {
ret = AVERROR(EINVAL);
goto fail;
}
} else {
- if (replace_str_data_in_filename(&r_dirname, dirname, 'v', vs->varname) < 1) {
+ if (replace_str_data_in_filename(&dirname_repl, dirname, 'v', vs->varname) < 1) {
ret = AVERROR(EINVAL);
goto fail;
}
}
- av_free(dirname);
- dirname = r_dirname;
+ dirname = dirname_repl;
}
while (segment) {
av_log(hls, AV_LOG_DEBUG, "deleting old segment %s\n",
- segment->filename);
- path_size = (hls->use_localtime_mkdir ? 0 : strlen(dirname)) + strlen(segment->filename) + 1;
+ segment->filename);
+ path_size = (hls->use_localtime_mkdir ? 0 : strlen(dirname)+1) + strlen(segment->filename) + 1;
path = av_malloc(path_size);
if (!path) {
ret = AVERROR(ENOMEM);
if (hls->use_localtime_mkdir)
av_strlcpy(path, segment->filename, path_size);
else { // segment->filename contains basename only
- av_strlcpy(path, dirname, path_size);
- av_strlcat(path, segment->filename, path_size);
+ snprintf(path, path_size, "%s%c%s", dirname, SEPARATOR, segment->filename);
}
proto = avio_find_protocol_name(s->url);
ff_format_io_close(vs->avf, &out);
} else if (unlink(path) < 0) {
av_log(hls, AV_LOG_ERROR, "failed to delete old segment %s: %s\n",
- path, strerror(errno));
+ path, strerror(errno));
}
if ((segment->sub_filename[0] != '\0')) {
- vtt_dirname = av_strdup(vs->vtt_avf->url);
- if (!vtt_dirname) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
- p = (char *)av_basename(vtt_dirname);
- *p = '\0';
- sub_path_size = strlen(segment->sub_filename) + 1 + strlen(vtt_dirname);
+ vtt_dirname_r = av_strdup(vs->vtt_avf->url);
+ vtt_dirname = (char*)av_dirname(vtt_dirname_r);
+ sub_path_size = strlen(segment->sub_filename) + 1 + strlen(vtt_dirname) + 1;
sub_path = av_malloc(sub_path_size);
if (!sub_path) {
ret = AVERROR(ENOMEM);
goto fail;
}
- av_strlcpy(sub_path, vtt_dirname, sub_path_size);
- av_strlcat(sub_path, segment->sub_filename, sub_path_size);
+ snprintf(sub_path, sub_path_size, "%s%c%s", vtt_dirname, SEPARATOR, segment->sub_filename);
+
+ av_freep(&vtt_dirname_r);
if (hls->method || (proto && !av_strcasecmp(proto, "http"))) {
av_dict_set(&options, "method", "DELETE", 0);
if ((ret = vs->vtt_avf->io_open(vs->vtt_avf, &out, sub_path, AVIO_FLAG_WRITE, &options)) < 0) {
if (hls->ignore_io_errors)
ret = 0;
- av_free(sub_path);
+ av_freep(&sub_path);
goto fail;
}
ff_format_io_close(vs->vtt_avf, &out);
} else if (unlink(sub_path) < 0) {
av_log(hls, AV_LOG_ERROR, "failed to delete old segment %s: %s\n",
- sub_path, strerror(errno));
+ sub_path, strerror(errno));
}
- av_free(sub_path);
+ av_freep(&sub_path);
}
av_freep(&path);
previous_segment = segment;
segment = previous_segment->next;
- av_free(previous_segment);
+ av_freep(&previous_segment);
}
fail:
- av_free(path);
- av_free(dirname);
- av_free(vtt_dirname);
+ av_freep(&path);
+ av_freep(&dirname_r);
+ av_freep(&dirname_repl);
+ av_freep(&vtt_dirname_r);
return ret;
}
int len;
AVIOContext *pb;
uint8_t key[KEYSIZE];
+ char * key_basename_source = (hls->master_m3u8_url) ? hls->master_m3u8_url : s->url;
- len = strlen(s->url) + 4 + 1;
+ len = strlen(key_basename_source) + 4 + 1;
hls->key_basename = av_mallocz(len);
if (!hls->key_basename)
return AVERROR(ENOMEM);
- av_strlcpy(hls->key_basename, s->url, len);
+ av_strlcpy(hls->key_basename, key_basename_source, len);
av_strlcat(hls->key_basename, ".key", len);
if (hls->key_url) {
if ((ret = s->io_open(s, &pb, hls->key_info_file, AVIO_FLAG_READ, NULL)) < 0) {
av_log(hls, AV_LOG_ERROR,
- "error opening key info file %s\n", hls->key_info_file);
+ "error opening key info file %s\n", hls->key_info_file);
return ret;
}
AVFormatContext *oc;
AVFormatContext *vtt_oc = NULL;
int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0);
+ int remaining_options;
int i, ret;
ret = avformat_alloc_output_context2(&vs->avf, vs->oformat, NULL, NULL);
if (!oc->url)
return AVERROR(ENOMEM);
- oc->oformat = vs->oformat;
- oc->interrupt_callback = s->interrupt_callback;
- oc->max_delay = s->max_delay;
- oc->opaque = s->opaque;
- oc->io_open = s->io_open;
- oc->io_close = s->io_close;
+ oc->oformat = vs->oformat;
+ oc->interrupt_callback = s->interrupt_callback;
+ oc->max_delay = s->max_delay;
+ oc->opaque = s->opaque;
+ oc->io_open = s->io_open;
+ oc->io_close = s->io_close;
+ oc->strict_std_compliance = s->strict_std_compliance;
av_dict_copy(&oc->metadata, s->metadata, 0);
- if(vs->vtt_oformat) {
+ if (vs->vtt_oformat) {
ret = avformat_alloc_output_context2(&vs->vtt_avf, vs->vtt_oformat, NULL, NULL);
if (ret < 0)
return ret;
vs->start_pos = 0;
vs->new_start = 1;
- if (hls->segment_type == SEGMENT_TYPE_FMP4) {
+ if (hls->segment_type == SEGMENT_TYPE_FMP4 && hls->max_seg_size > 0) {
+ if (hls->http_persistent > 0) {
+ //TODO: Support fragment fmp4 for http persistent in HLS muxer.
+ av_log(s, AV_LOG_WARNING, "http persistent mode is currently unsupported for fragment mp4 in the HLS muxer.\n");
+ }
if (hls->max_seg_size > 0) {
av_log(s, AV_LOG_WARNING, "Multi-file byterange mode is currently unsupported in the HLS muxer.\n");
return AVERROR_PATCHWELCOME;
}
+ }
- vs->packets_written = 0;
- vs->init_range_length = 0;
- set_http_options(s, &options, hls);
- if ((ret = avio_open_dyn_buf(&oc->pb)) < 0)
- return ret;
+ vs->packets_written = 0;
+ vs->init_range_length = 0;
+
+ if ((ret = avio_open_dyn_buf(&oc->pb)) < 0)
+ return ret;
+ if (hls->segment_type == SEGMENT_TYPE_FMP4) {
+ set_http_options(s, &options, hls);
if (byterange_mode) {
ret = hlsenc_io_open(s, &vs->out, vs->basename, &options);
} else {
ret = hlsenc_io_open(s, &vs->out, vs->base_output_dirname, &options);
}
av_dict_free(&options);
- if (ret < 0) {
- av_log(s, AV_LOG_ERROR, "Failed to open segment '%s'\n", vs->fmp4_init_filename);
- return ret;
- }
-
- if (hls->format_options_str) {
- ret = av_dict_parse_string(&hls->format_options, hls->format_options_str, "=", ":", 0);
- if (ret < 0) {
- av_log(s, AV_LOG_ERROR, "Could not parse format options list '%s'\n",
- hls->format_options_str);
- return ret;
- }
- }
+ }
+ if (ret < 0) {
+ av_log(s, AV_LOG_ERROR, "Failed to open segment '%s'\n", vs->fmp4_init_filename);
+ return ret;
+ }
- av_dict_copy(&options, hls->format_options, 0);
+ av_dict_copy(&options, hls->format_options, 0);
+ if (hls->segment_type == SEGMENT_TYPE_FMP4) {
av_dict_set(&options, "fflags", "-autobsf", 0);
av_dict_set(&options, "movflags", "+frag_custom+dash+delay_moov", AV_DICT_APPEND);
- ret = avformat_init_output(oc, &options);
- if (ret < 0)
- return ret;
- if (av_dict_count(options)) {
- av_log(s, AV_LOG_ERROR, "Some of the provided format options in '%s' are not recognized\n", hls->format_options_str);
- av_dict_free(&options);
- return AVERROR(EINVAL);
- }
- avio_flush(oc->pb);
- av_dict_free(&options);
+ } else {
+ /* We only require one PAT/PMT per segment. */
+ char period[21];
+ snprintf(period, sizeof(period), "%d", (INT_MAX / 2) - 1);
+ av_dict_set(&options, "sdt_period", period, AV_DICT_DONT_OVERWRITE);
+ av_dict_set(&options, "pat_period", period, AV_DICT_DONT_OVERWRITE);
+ }
+ 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);
return 0;
}
strlen(vs->current_segment_final_filename_fmt)) {
char * new_url = av_strdup(vs->current_segment_final_filename_fmt);
if (!new_url) {
- av_free(en);
return AVERROR(ENOMEM);
}
ff_format_set_url(vs->avf, new_url);
if (replace_int_data_in_filename(&filename, vs->avf->url, 's', pos + size) < 1) {
av_log(hls, AV_LOG_ERROR,
"Invalid second level segment filename template '%s', "
- "you can try to remove second_level_segment_size flag\n",
+ "you can try to remove second_level_segment_size flag\n",
vs->avf->url);
- av_free(filename);
- av_free(en);
+ av_freep(&filename);
return AVERROR(EINVAL);
}
ff_format_set_url(vs->avf, filename);
if (hls->flags & HLS_SECOND_LEVEL_SEGMENT_DURATION) {
char *filename = NULL;
if (replace_int_data_in_filename(&filename, vs->avf->url,
- 't', (int64_t)round(duration * HLS_MICROSECOND_UNIT)) < 1) {
+ 't', (int64_t)round(duration * HLS_MICROSECOND_UNIT)) < 1) {
av_log(hls, AV_LOG_ERROR,
"Invalid second level segment filename template '%s', "
- "you can try to remove second_level_segment_time flag\n",
+ "you can try to remove second_level_segment_time flag\n",
vs->avf->url);
- av_free(filename);
- av_free(en);
+ av_freep(&filename);
return AVERROR(EINVAL);
}
ff_format_set_url(vs->avf, filename);
int ret = 0;
if (hls->flags & HLS_SECOND_LEVEL_SEGMENT_DURATION) {
- av_log(hls, AV_LOG_ERROR,
- "second_level_segment_duration hls_flag requires strftime to be true\n");
- ret = AVERROR(EINVAL);
+ av_log(hls, AV_LOG_ERROR,
+ "second_level_segment_duration hls_flag requires strftime to be true\n");
+ ret = AVERROR(EINVAL);
}
if (hls->flags & HLS_SECOND_LEVEL_SEGMENT_SIZE) {
- av_log(hls, AV_LOG_ERROR,
- "second_level_segment_size hls_flag requires strfime to be true\n");
- ret = AVERROR(EINVAL);
+ av_log(hls, AV_LOG_ERROR,
+ "second_level_segment_size hls_flag requires strfime to be true\n");
+ ret = AVERROR(EINVAL);
}
if (hls->flags & HLS_SECOND_LEVEL_SEGMENT_INDEX) {
av_log(hls, AV_LOG_ERROR,
int ret = 0;
if ((hls->flags & HLS_SECOND_LEVEL_SEGMENT_DURATION) && !segment_renaming_ok) {
- av_log(hls, AV_LOG_ERROR,
- "second_level_segment_duration hls_flag works only with file protocol segment names\n");
- ret = AVERROR(EINVAL);
+ av_log(hls, AV_LOG_ERROR,
+ "second_level_segment_duration hls_flag works only with file protocol segment names\n");
+ ret = AVERROR(EINVAL);
}
if ((hls->flags & HLS_SECOND_LEVEL_SEGMENT_SIZE) && !segment_renaming_ok) {
- av_log(hls, AV_LOG_ERROR,
- "second_level_segment_size hls_flag works only with file protocol segment names\n");
- ret = AVERROR(EINVAL);
+ av_log(hls, AV_LOG_ERROR,
+ "second_level_segment_size hls_flag works only with file protocol segment names\n");
+ ret = AVERROR(EINVAL);
}
return ret;
av_log(c, AV_LOG_ERROR, "Invalid second level segment filename template '%s', "
"you can try to remove second_level_segment_index flag\n",
oc->url);
- av_free(filename);
+ av_freep(&filename);
return AVERROR(EINVAL);
}
ff_format_set_url(oc, filename);
av_log(c, AV_LOG_ERROR, "Invalid second level segment filename template '%s', "
"you can try to remove second_level_segment_size flag\n",
oc->url);
- av_free(filename);
+ av_freep(&filename);
return AVERROR(EINVAL);
}
ff_format_set_url(oc, filename);
av_log(c, AV_LOG_ERROR, "Invalid second level segment filename template '%s', "
"you can try to remove second_level_segment_time flag\n",
oc->url);
- av_free(filename);
+ av_freep(&filename);
return AVERROR(EINVAL);
}
ff_format_set_url(oc, filename);
en->var_stream_idx = vs->var_stream_idx;
ret = sls_flags_filename_process(s, hls, vs, en, duration, pos, size);
if (ret < 0) {
+ av_freep(&en);
return ret;
}
}
av_strlcpy(en->filename, filename, sizeof(en->filename));
- if(vs->has_subtitle)
+ if (vs->has_subtitle)
av_strlcpy(en->sub_filename, av_basename(vs->vtt_avf->url), sizeof(en->sub_filename));
else
en->sub_filename[0] = '\0';
if ((ret = hls_delete_old_segments(s, hls, vs)) < 0)
return ret;
} else
- av_free(en);
+ av_freep(&en);
} else
vs->nb_entries++;
AVIOContext *in;
int ret = 0, is_segment = 0;
int64_t new_start_pos;
- char line[1024];
+ char line[MAX_URL_SIZE];
const char *ptr;
const char *end;
is_segment = 0;
new_start_pos = avio_tell(vs->avf->pb);
vs->size = new_start_pos - vs->start_pos;
+ vs->initial_prog_date_time -= vs->duration; // this is a previously existing segment
ret = hls_append_segment(s, hls, vs, vs->duration, vs->start_pos, vs->size);
if (ret < 0)
goto fail;
{
HLSSegment *en;
- while(p) {
+ while (p) {
en = p;
p = p->next;
- av_free(en);
+ av_freep(&en);
}
}
return ret;
}
-static int get_relative_url(const char *master_url, const char *media_url,
- char *rel_url, int rel_url_buf_size)
+static const char* get_relative_url(const char *master_url, const char *media_url)
{
- char *p = NULL;
- int base_len = -1;
- p = strrchr(master_url, '/') ? strrchr(master_url, '/') :\
- strrchr(master_url, '\\');
+ const char *p = strrchr(master_url, '/');
+ size_t base_len = 0;
+
+ if (!p) p = strrchr(master_url, '\\');
+
if (p) {
- base_len = FFABS(p - master_url);
+ base_len = p - master_url;
if (av_strncasecmp(master_url, media_url, base_len)) {
av_log(NULL, AV_LOG_WARNING, "Unable to find relative url\n");
- return AVERROR(EINVAL);
+ return NULL;
}
}
- av_strlcpy(rel_url, &(media_url[base_len + 1]), rel_url_buf_size);
- return 0;
+
+ return media_url + base_len;
}
-static int64_t get_stream_bit_rate(AVStream *stream) {
+static int64_t get_stream_bit_rate(AVStream *stream)
+{
AVCPBProperties *props = (AVCPBProperties*)av_stream_get_side_data(
stream,
AV_PKT_DATA_CPB_PROPERTIES,
AVStream *vid_st, *aud_st;
AVDictionary *options = NULL;
unsigned int i, j;
- int m3u8_name_size, ret, bandwidth;
- char *m3u8_rel_name = NULL, *ccgroup;
+ int ret, bandwidth;
+ const char *m3u8_rel_name = NULL;
+ char *ccgroup;
ClosedCaptionsStream *ccs;
const char *proto = avio_find_protocol_name(hls->master_m3u8_url);
int is_file_proto = proto && !strcmp(proto, "file");
int use_temp_file = is_file_proto && ((hls->flags & HLS_TEMP_FILE) || hls->master_publish_rate);
- char temp_filename[1024];
+ char temp_filename[MAX_URL_SIZE];
input_vs->m3u8_created = 1;
if (!hls->master_m3u8_created) {
ret = hlsenc_io_open(s, &hls->m3u8_out, temp_filename, &options);
av_dict_free(&options);
if (ret < 0) {
- av_log(NULL, AV_LOG_ERROR, "Failed to open master play list file '%s'\n",
+ av_log(s, AV_LOG_ERROR, "Failed to open master play list file '%s'\n",
temp_filename);
goto fail;
}
if (vs->has_video || vs->has_subtitle || !vs->agroup)
continue;
- m3u8_name_size = strlen(vs->m3u8_name) + 1;
- m3u8_rel_name = av_malloc(m3u8_name_size);
+ m3u8_rel_name = get_relative_url(hls->master_m3u8_url, vs->m3u8_name);
if (!m3u8_rel_name) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
- av_strlcpy(m3u8_rel_name, vs->m3u8_name, m3u8_name_size);
- ret = get_relative_url(hls->master_m3u8_url, vs->m3u8_name,
- m3u8_rel_name, m3u8_name_size);
- if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Unable to find relative URL\n");
goto fail;
}
ff_hls_write_audio_rendition(hls->m3u8_out, vs->agroup, m3u8_rel_name, vs->language, i, hls->has_default_key ? vs->is_default : 1);
-
- av_freep(&m3u8_rel_name);
}
/* For variant streams with video add #EXT-X-STREAM-INF tag with attributes*/
for (i = 0; i < hls->nb_varstreams; i++) {
vs = &(hls->var_streams[i]);
- m3u8_name_size = strlen(vs->m3u8_name) + 1;
- m3u8_rel_name = av_malloc(m3u8_name_size);
+ m3u8_rel_name = get_relative_url(hls->master_m3u8_url, vs->m3u8_name);
if (!m3u8_rel_name) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
- av_strlcpy(m3u8_rel_name, vs->m3u8_name, m3u8_name_size);
- ret = get_relative_url(hls->master_m3u8_url, vs->m3u8_name,
- m3u8_rel_name, m3u8_name_size);
- if (ret < 0) {
- av_log(NULL, AV_LOG_ERROR, "Unable to find relative URL\n");
+ av_log(s, AV_LOG_ERROR, "Unable to find relative URL\n");
goto fail;
}
}
if (!vid_st && !aud_st) {
- av_log(NULL, AV_LOG_WARNING, "Media stream not found\n");
+ av_log(s, AV_LOG_WARNING, "Media stream not found\n");
continue;
}
}
}
if (j == hls->nb_ccstreams)
- av_log(NULL, AV_LOG_WARNING, "mapping ccgroup %s not found\n",
+ av_log(s, AV_LOG_WARNING, "mapping ccgroup %s not found\n",
vs->ccgroup);
}
aud_st ? vs->agroup : NULL, vs->codec_attr, ccgroup);
}
}
-
- av_freep(&m3u8_rel_name);
}
fail:
- if(ret >=0)
+ if (ret >=0)
hls->master_m3u8_created = 1;
- av_freep(&m3u8_rel_name);
hlsenc_io_close(s, &hls->m3u8_out, temp_filename);
if (use_temp_file)
ff_rename(temp_filename, hls->master_m3u8_url, s);
HLSSegment *en;
int target_duration = 0;
int ret = 0;
- char temp_filename[1024];
- char temp_vtt_filename[1024];
+ char temp_filename[MAX_URL_SIZE];
+ char temp_vtt_filename[MAX_URL_SIZE];
int64_t sequence = FFMAX(hls->start_sequence, vs->sequence - vs->nb_entries);
const char *proto = avio_find_protocol_name(vs->m3u8_name);
int is_file_proto = proto && !strcmp(proto, "file");
set_http_options(s, &options, hls);
snprintf(temp_filename, sizeof(temp_filename), use_temp_file ? "%s.tmp" : "%s", vs->m3u8_name);
- if ((ret = hlsenc_io_open(s, &hls->m3u8_out, temp_filename, &options)) < 0) {
+ if ((ret = hlsenc_io_open(s, byterange_mode ? &hls->m3u8_out : &vs->out, temp_filename, &options)) < 0) {
if (hls->ignore_io_errors)
ret = 0;
goto fail;
}
vs->discontinuity_set = 0;
- ff_hls_write_playlist_header(hls->m3u8_out, hls->version, hls->allowcache,
+ 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 ){
- avio_printf(hls->m3u8_out, "#EXT-X-DISCONTINUITY\n");
+ 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;
}
if (vs->has_video && (hls->flags & HLS_INDEPENDENT_SEGMENTS)) {
- avio_printf(hls->m3u8_out, "#EXT-X-INDEPENDENT-SEGMENTS\n");
+ avio_printf(byterange_mode ? hls->m3u8_out : vs->out, "#EXT-X-INDEPENDENT-SEGMENTS\n");
}
for (en = vs->segments; en; en = en->next) {
if ((hls->encrypt || hls->key_info_file) && (!key_uri || strcmp(en->key_uri, key_uri) ||
av_strcasecmp(en->iv_string, iv_string))) {
- avio_printf(hls->m3u8_out, "#EXT-X-KEY:METHOD=AES-128,URI=\"%s\"", en->key_uri);
+ avio_printf(byterange_mode ? hls->m3u8_out : vs->out, "#EXT-X-KEY:METHOD=AES-128,URI=\"%s\"", en->key_uri);
if (*en->iv_string)
- avio_printf(hls->m3u8_out, ",IV=0x%s", en->iv_string);
- avio_printf(hls->m3u8_out, "\n");
+ avio_printf(byterange_mode ? hls->m3u8_out : vs->out, ",IV=0x%s", en->iv_string);
+ avio_printf(byterange_mode ? hls->m3u8_out : vs->out, "\n");
key_uri = en->key_uri;
iv_string = en->iv_string;
}
if ((hls->segment_type == SEGMENT_TYPE_FMP4) && (en == vs->segments)) {
- ff_hls_write_init_file(hls->m3u8_out, (hls->flags & HLS_SINGLE_FILE) ? en->filename : vs->fmp4_init_filename,
+ ff_hls_write_init_file(byterange_mode ? hls->m3u8_out : vs->out, (hls->flags & HLS_SINGLE_FILE) ? en->filename : vs->fmp4_init_filename,
hls->flags & HLS_SINGLE_FILE, vs->init_range_length, 0);
}
- ret = ff_hls_write_file_entry(hls->m3u8_out, en->discont, byterange_mode,
+ ret = ff_hls_write_file_entry(byterange_mode ? hls->m3u8_out : vs->out, en->discont, byterange_mode,
en->duration, hls->flags & HLS_ROUND_DURATIONS,
en->size, en->pos, vs->baseurl,
en->filename, prog_date_time_p, en->keyframe_size, en->keyframe_pos, hls->flags & HLS_I_FRAMES_ONLY);
}
if (last && (hls->flags & HLS_OMIT_ENDLIST)==0)
- ff_hls_write_end_list(hls->m3u8_out);
+ ff_hls_write_end_list(byterange_mode ? hls->m3u8_out : vs->out);
if (vs->vtt_m3u8_name) {
snprintf(temp_vtt_filename, sizeof(temp_vtt_filename), use_temp_file ? "%s.tmp" : "%s", vs->vtt_m3u8_name);
fail:
av_dict_free(&options);
- hlsenc_io_close(s, &hls->m3u8_out, temp_filename);
+ ret = hlsenc_io_close(s, byterange_mode ? &hls->m3u8_out : &vs->out, temp_filename);
+ if (ret < 0) {
+ return ret;
+ }
hlsenc_io_close(s, &hls->sub_m3u8_out, vs->vtt_m3u8_name);
if (use_temp_file) {
ff_rename(temp_filename, vs->m3u8_name, s);
AVDictionary *options = NULL;
const char *proto = NULL;
int use_temp_file = 0;
- char *filename, iv_string[KEYSIZE*2 + 1];
+ char iv_string[KEYSIZE*2 + 1];
int err = 0;
if (c->flags & HLS_SINGLE_FILE) {
#else
vs->basename, 'd', vs->sequence) < 1) {
#endif
- av_free(filename);
+ av_freep(&filename);
av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s', you can try to use -strftime 1 with it\n", vs->basename);
return AVERROR(EINVAL);
}
if (c->use_localtime) {
time_t now0;
struct tm *tm, tmpbuf;
- int bufsize = strlen(vs->basename) + 1024;
+ int bufsize = strlen(vs->basename) + MAX_URL_SIZE;
char *buf = av_mallocz(bufsize);
if (!buf)
return AVERROR(ENOMEM);
if (c->use_localtime_mkdir) {
const char *dir;
char *fn_copy = av_strdup(oc->url);
- if (!fn_copy) {
- return AVERROR(ENOMEM);
- }
dir = av_dirname(fn_copy);
if (ff_mkdir_p(dir) == -1 && errno != EEXIST) {
av_log(oc, AV_LOG_ERROR, "Could not create directory %s with use_localtime_mkdir\n", dir);
- av_free(fn_copy);
+ av_freep(&fn_copy);
return AVERROR(errno);
}
- av_free(fn_copy);
+ av_freep(&fn_copy);
}
} else {
char *filename = NULL;
#else
vs->basename, 'd', vs->sequence) < 1) {
#endif
- av_free(filename);
+ av_freep(&filename);
av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s' you can try to use -strftime 1 with it\n", vs->basename);
return AVERROR(EINVAL);
}
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
#else
vs->vtt_basename, 'd', vs->sequence) < 1) {
#endif
- av_free(filename);
+ av_freep(&filename);
av_log(vtt_oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", vs->vtt_basename);
return AVERROR(EINVAL);
}
}
vs->number++;
- set_http_options(s, &options, c);
-
proto = avio_find_protocol_name(oc->url);
use_temp_file = proto && !strcmp(proto, "file") && (c->flags & HLS_TEMP_FILE);
}
c->encrypt_started = 1;
}
- if ((err = av_dict_set(&options, "encryption_key", c->key_string, 0))
- < 0)
- goto fail;
err = av_strlcpy(iv_string, c->iv_string, sizeof(iv_string));
- if (!err)
+ if (!err) {
snprintf(iv_string, sizeof(iv_string), "%032"PRIx64, vs->sequence);
- if ((err = av_dict_set(&options, "encryption_iv", iv_string, 0)) < 0)
- goto fail;
-
- filename = av_asprintf("crypto:%s", oc->url);
- if (!filename) {
- err = AVERROR(ENOMEM);
- goto fail;
+ memset(c->iv_string, 0, sizeof(c->iv_string));
+ memcpy(c->iv_string, iv_string, sizeof(iv_string));
}
- err = hlsenc_io_open(s, &oc->pb, filename, &options);
- av_free(filename);
- av_dict_free(&options);
- if (err < 0)
- return err;
- } else if (c->segment_type != SEGMENT_TYPE_FMP4) {
- if ((err = hlsenc_io_open(s, &oc->pb, oc->url, &options)) < 0) {
- if (c->ignore_io_errors)
- err = 0;
- goto fail;
+ }
+ if (c->segment_type != SEGMENT_TYPE_FMP4) {
+ if (oc->oformat->priv_class && oc->priv_data) {
+ av_opt_set(oc->priv_data, "mpegts_flags", "resend_headers", 0);
+ }
+ if (c->flags & HLS_SINGLE_FILE) {
+ set_http_options(s, &options, c);
+ if ((err = hlsenc_io_open(s, &vs->out, oc->url, &options)) < 0) {
+ if (c->ignore_io_errors)
+ err = 0;
+ goto fail;
+ }
}
}
if (vs->vtt_basename) {
}
av_dict_free(&options);
- if (c->segment_type != SEGMENT_TYPE_FMP4) {
- /* We only require one PAT/PMT per segment. */
- 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, "sdt_period", period, 0);
- av_opt_set(oc->priv_data, "pat_period", period, 0);
- }
- }
-
if (vs->vtt_basename) {
err = avformat_write_header(vtt_oc,NULL);
if (err < 0)
}
fn_dup = av_strdup(fn);
- if (!fn_dup) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
-
filename = av_basename(fn);
subdir_name = av_dirname(fn_dup);
/* if %v is present in the file's directory, create sub-directory */
if (av_stristr(dir, "%v") && proto && !strcmp(proto, "file")) {
mod_buf_dup = av_strdup(*s);
- if (!mod_buf_dup) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
-
dir = av_dirname(mod_buf_dup);
if (ff_mkdir_p(dir) == -1 && errno != EEXIST) {
ret = AVERROR(errno);
VariantStream *vs;
int stream_index, i, j;
enum AVMediaType codec_type;
- int nb_varstreams, nb_streams;
+ int nb_varstreams = 0, nb_streams;
char *p, *q, *saveptr1, *saveptr2, *varstr, *keyval;
const char *val;
* agroup: is key to specify audio group. A string can be given as value.
*/
p = av_strdup(hls->var_stream_map);
+ if (!p)
+ return AVERROR(ENOMEM);
+
q = p;
- while(av_strtok(q, " \t", &saveptr1)) {
+ while (av_strtok(q, " \t", &saveptr1)) {
q = NULL;
- hls->nb_varstreams++;
+ nb_varstreams++;
}
av_freep(&p);
- hls->var_streams = av_mallocz(sizeof(*hls->var_streams) * hls->nb_varstreams);
+ hls->var_streams = av_mallocz(sizeof(*hls->var_streams) * nb_varstreams);
if (!hls->var_streams)
return AVERROR(ENOMEM);
+ hls->nb_varstreams = nb_varstreams;
p = hls->var_stream_map;
nb_varstreams = 0;
while (keyval = av_strtok(varstr, ",", &saveptr2)) {
varstr = NULL;
if (av_strstart(keyval, "language:", &val)) {
+ av_free(vs->language);
vs->language = av_strdup(val);
if (!vs->language)
return AVERROR(ENOMEM);
hls->has_default_key = 1;
continue;
} else if (av_strstart(keyval, "name:", &val)) {
+ av_free(vs->varname);
vs->varname = av_strdup(val);
if (!vs->varname)
return AVERROR(ENOMEM);
continue;
} else if (av_strstart(keyval, "agroup:", &val)) {
+ av_free(vs->agroup);
vs->agroup = av_strdup(val);
if (!vs->agroup)
return AVERROR(ENOMEM);
continue;
} else if (av_strstart(keyval, "ccgroup:", &val)) {
+ av_free(vs->ccgroup);
vs->ccgroup = av_strdup(val);
if (!vs->ccgroup)
return AVERROR(ENOMEM);
atoi(val));
if (stream_index >= 0 && nb_streams < vs->nb_streams) {
- for(i = 0; nb_streams > 0 && i < nb_streams; i++) {
+ for (i = 0; nb_streams > 0 && i < nb_streams; i++) {
if (vs->streams[i] == s->streams[stream_index]) {
av_log(s, AV_LOG_ERROR, "Same elementary stream found more than once inside "
"variant definition #%d\n", nb_varstreams - 1);
return AVERROR(EINVAL);
}
}
- for(j = 0; nb_varstreams > 1 && j < nb_varstreams - 1; j++) {
- for(i = 0; i < hls->var_streams[j].nb_streams; i++) {
+ for (j = 0; nb_varstreams > 1 && j < nb_varstreams - 1; j++) {
+ for (i = 0; i < hls->var_streams[j].nb_streams; i++) {
if (hls->var_streams[j].streams[i] == s->streams[stream_index]) {
av_log(s, AV_LOG_ERROR, "Same elementary stream found more than once "
"in two different variant definitions #%d and #%d\n",
static int parse_cc_stream_mapstring(AVFormatContext *s)
{
HLSContext *hls = s->priv_data;
- int nb_ccstreams;
+ int nb_ccstreams = 0;
char *p, *q, *ccstr, *keyval;
char *saveptr1 = NULL, *saveptr2 = NULL;
const char *val;
ClosedCaptionsStream *ccs;
p = av_strdup(hls->cc_stream_map);
+ if(!p)
+ return AVERROR(ENOMEM);
+
q = p;
- while(av_strtok(q, " \t", &saveptr1)) {
+ while (av_strtok(q, " \t", &saveptr1)) {
q = NULL;
- hls->nb_ccstreams++;
+ nb_ccstreams++;
}
av_freep(&p);
- hls->cc_streams = av_mallocz(sizeof(*hls->cc_streams) * hls->nb_ccstreams);
+ hls->cc_streams = av_mallocz(sizeof(*hls->cc_streams) * nb_ccstreams);
if (!hls->cc_streams)
return AVERROR(ENOMEM);
+ hls->nb_ccstreams = nb_ccstreams;
p = hls->cc_stream_map;
nb_ccstreams = 0;
ccstr = NULL;
if (av_strstart(keyval, "ccgroup:", &val)) {
+ av_free(ccs->ccgroup);
ccs->ccgroup = av_strdup(val);
if (!ccs->ccgroup)
return AVERROR(ENOMEM);
} else if (av_strstart(keyval, "instreamid:", &val)) {
+ av_free(ccs->instreamid);
ccs->instreamid = av_strdup(val);
if (!ccs->instreamid)
return AVERROR(ENOMEM);
} else if (av_strstart(keyval, "language:", &val)) {
+ av_free(ccs->language);
ccs->language = av_strdup(val);
if (!ccs->language)
return AVERROR(ENOMEM);
}
if (av_strstart(ccs->instreamid, "CC", &val)) {
- if(atoi(val) < 1 || atoi(val) > 4) {
+ if (atoi(val) < 1 || atoi(val) > 4) {
av_log(s, AV_LOG_ERROR, "Invalid instream ID CC index %d in %s, range 1-4\n",
atoi(val), ccs->instreamid);
return AVERROR(EINVAL);
}
} else if (av_strstart(ccs->instreamid, "SERVICE", &val)) {
- if(atoi(val) < 1 || atoi(val) > 63) {
+ if (atoi(val) < 1 || atoi(val) > 63) {
av_log(s, AV_LOG_ERROR, "Invalid instream ID SERVICE index %d in %s, range 1-63 \n",
atoi(val), ccs->instreamid);
return AVERROR(EINVAL);
}
} else {
- av_log(s, AV_LOG_ERROR, "Invalid instream ID %s, supported are CCn or SERIVICEn\n",
+ av_log(s, AV_LOG_ERROR, "Invalid instream ID %s, supported are CCn or SERVICEn\n",
ccs->instreamid);
return AVERROR(EINVAL);
}
return 0;
}
-static int update_variant_stream_info(AVFormatContext *s) {
+static int update_variant_stream_info(AVFormatContext *s)
+{
HLSContext *hls = s->priv_data;
unsigned int i;
int ret = 0;
return parse_variant_stream_mapstring(s);
} else {
//By default, a single variant stream with all the codec streams is created
- hls->nb_varstreams = 1;
- hls->var_streams = av_mallocz(sizeof(*hls->var_streams) *
- hls->nb_varstreams);
+ hls->var_streams = av_mallocz(sizeof(*hls->var_streams));
if (!hls->var_streams)
return AVERROR(ENOMEM);
+ hls->nb_varstreams = 1;
hls->var_streams[0].var_stream_idx = 0;
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++)
return 0;
}
-static int update_master_pl_info(AVFormatContext *s) {
+static int update_master_pl_info(AVFormatContext *s)
+{
HLSContext *hls = s->priv_data;
const char *dir;
char *fn1= NULL, *fn2 = NULL;
int ret = 0;
fn1 = av_strdup(s->url);
- if (!fn1) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
-
dir = av_dirname(fn1);
/**
*/
if (dir && av_stristr(av_basename(dir), "%v")) {
fn2 = av_strdup(dir);
- if (!fn2) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
dir = av_dirname(fn2);
}
int use_temp_file = 0;
uint8_t *buffer = NULL;
VariantStream *vs = NULL;
- AVDictionary *options = NULL;
char *old_filename = NULL;
for (i = 0; i < hls->nb_varstreams; 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 */
- int init_list_dur = hls->init_time * vs->nb_entries * AV_TIME_BASE;
- int after_init_list_dur = (vs->sequence - hls->start_sequence - vs->nb_entries ) * (hls->time * AV_TIME_BASE);
+ 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);
hls->recording_time = hls->time * AV_TIME_BASE;
end_pts = init_list_dur + after_init_list_dur ;
}
int64_t new_start_pos;
int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0);
- av_write_frame(vs->avf, NULL); /* Flush any buffered data */
-
- new_start_pos = avio_tell(vs->avf->pb);
-
- if (hls->segment_type != SEGMENT_TYPE_FMP4) {
- avio_flush(oc->pb);
- vs->size = new_start_pos - vs->start_pos;
- } else {
- vs->size = new_start_pos;
- }
-
+ av_write_frame(oc, NULL); /* Flush any buffered data */
+ new_start_pos = avio_tell(oc->pb);
+ vs->size = new_start_pos - vs->start_pos;
+ avio_flush(oc->pb);
if (hls->segment_type == SEGMENT_TYPE_FMP4) {
if (!vs->init_range_length) {
- avio_flush(oc->pb);
range_length = avio_close_dyn_buf(oc->pb, &buffer);
avio_write(vs->out, buffer, range_length);
- av_free(buffer);
+ av_freep(&buffer);
vs->init_range_length = range_length;
avio_open_dyn_buf(&oc->pb);
vs->packets_written = 0;
vs->start_pos = range_length;
if (!byterange_mode) {
- ff_format_io_close(s, &vs->out);
hlsenc_io_close(s, &vs->out, vs->base_output_dirname);
}
}
- } else {
- if (!byterange_mode) {
- hlsenc_io_close(s, &oc->pb, oc->url);
- }
}
if (!byterange_mode) {
if (vs->vtt_avf) {
use_temp_file = proto && !strcmp(proto, "file") && (hls->flags & HLS_TEMP_FILE);
}
- // look to rename the asset name
- if (use_temp_file) {
- if (!(hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size <= 0))
- if ((vs->avf->oformat->priv_class && vs->avf->priv_data) && hls->segment_type != SEGMENT_TYPE_FMP4)
- av_opt_set(vs->avf->priv_data, "mpegts_flags", "resend_headers", 0);
- }
-
- if (hls->segment_type == SEGMENT_TYPE_FMP4) {
- if (hls->flags & HLS_SINGLE_FILE) {
- ret = flush_dynbuf(vs, &range_length);
- if (ret < 0) {
- return ret;
+ if (hls->flags & HLS_SINGLE_FILE) {
+ ret = flush_dynbuf(vs, &range_length);
+ av_freep(&vs->temp_buffer);
+ if (ret < 0) {
+ return ret;
+ }
+ vs->size = range_length;
+ } else {
+ if ((hls->max_seg_size > 0 && (vs->size >= hls->max_seg_size)) || !byterange_mode) {
+ AVDictionary *options = NULL;
+ char *filename = NULL;
+ if (hls->key_info_file || hls->encrypt) {
+ av_dict_set(&options, "encryption_key", hls->key_string, 0);
+ av_dict_set(&options, "encryption_iv", hls->iv_string, 0);
+ filename = av_asprintf("crypto:%s", oc->url);
+ } else {
+ filename = av_asprintf("%s", oc->url);
}
- vs->size = range_length;
- } else {
+ if (!filename) {
+ av_dict_free(&options);
+ return AVERROR(ENOMEM);
+ }
+
+ // look to rename the asset name
+ if (use_temp_file)
+ av_dict_set(&options, "mpegts_flags", "resend_headers", 0);
+
set_http_options(s, &options, hls);
- ret = hlsenc_io_open(s, &vs->out, vs->avf->url, &options);
+
+ ret = hlsenc_io_open(s, &vs->out, filename, &options);
if (ret < 0) {
av_log(s, hls->ignore_io_errors ? AV_LOG_WARNING : AV_LOG_ERROR,
- "Failed to open file '%s'\n", vs->avf->url);
+ "Failed to open file '%s'\n", filename);
+ av_dict_free(&options);
return hls->ignore_io_errors ? 0 : ret;
}
- write_styp(vs->out);
+ if (hls->segment_type == SEGMENT_TYPE_FMP4) {
+ write_styp(vs->out);
+ }
ret = flush_dynbuf(vs, &range_length);
if (ret < 0) {
+ av_dict_free(&options);
return ret;
}
- ff_format_io_close(s, &vs->out);
+ ret = hlsenc_io_close(s, &vs->out, filename);
+ if (ret < 0) {
+ av_log(s, AV_LOG_WARNING, "upload segment failed,"
+ " will retry with a new http session.\n");
+ ff_format_io_close(s, &vs->out);
+ ret = hlsenc_io_open(s, &vs->out, filename, &options);
+ reflush_dynbuf(vs, &range_length);
+ ret = hlsenc_io_close(s, &vs->out, filename);
+ }
+ av_dict_free(&options);
+ av_freep(&vs->temp_buffer);
+ av_freep(&filename);
}
}
hls_rename_temp_file(s, oc);
}
- old_filename = av_strdup(vs->avf->url);
+ old_filename = av_strdup(oc->url);
if (!old_filename) {
return AVERROR(ENOMEM);
}
vs->end_pts = pkt->pts;
vs->duration = 0;
if (ret < 0) {
- av_free(old_filename);
+ av_freep(&old_filename);
return ret;
}
}
- if (hls->segment_type != SEGMENT_TYPE_FMP4) {
- vs->start_pos = new_start_pos;
- } else {
- vs->start_pos += vs->size;
+ // if we're building a VOD playlist, skip writing the manifest multiple times, and just wait until the end
+ if (hls->pl_type != PLAYLIST_TYPE_VOD) {
+ 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) {
- if (vs->start_pos >= hls->max_seg_size) {
+ vs->start_pos = new_start_pos;
+ if (vs->size >= hls->max_seg_size) {
vs->sequence++;
sls_flag_file_rename(hls, vs, old_filename);
ret = hls_start(s, vs);
}
vs->number++;
} else {
+ vs->start_pos = new_start_pos;
sls_flag_file_rename(hls, vs, old_filename);
ret = hls_start(s, vs);
}
- av_free(old_filename);
+ av_freep(&old_filename);
if (ret < 0) {
return ret;
}
- // if we're building a VOD playlist, skip writing the manifest multiple times, and just wait until the end
- if (hls->pl_type != PLAYLIST_TYPE_VOD) {
- if ((ret = hls_window(s, 0, vs)) < 0) {
- return ret;
- }
- }
}
vs->packets_written++;
if (oc->pb) {
ret = ff_write_chained(oc, stream_index, pkt, s, 0);
+ vs->video_keyframe_size += pkt->size;
if ((st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) && (pkt->flags & AV_PKT_FLAG_KEY)) {
- vs->video_keyframe_size = avio_tell(oc->pb) - vs->video_lastpos;
- vs->video_keyframe_pos = vs->start_pos;
+ vs->video_keyframe_size = avio_tell(oc->pb);
} else {
- vs->video_lastpos = avio_tell(oc->pb);
+ vs->video_keyframe_pos = avio_tell(vs->out);
}
-
if (hls->ignore_io_errors)
ret = 0;
}
if (vtt_oc) {
av_freep(&vs->vtt_basename);
av_freep(&vs->vtt_m3u8_name);
+ avformat_free_context(vtt_oc);
}
+ avformat_free_context(vs->avf);
+
hls_free_segments(vs->segments);
hls_free_segments(vs->old_segments);
av_freep(&vs->m3u8_name);
int i;
int ret = 0;
VariantStream *vs = NULL;
+ AVDictionary *options = NULL;
+ int range_length, byterange_mode;
for (i = 0; i < hls->nb_varstreams; i++) {
+ char *filename = NULL;
vs = &hls->var_streams[i];
-
oc = vs->avf;
vtt_oc = vs->vtt_avf;
- old_filename = av_strdup(vs->avf->url);
+ old_filename = av_strdup(oc->url);
use_temp_file = 0;
if (!old_filename) {
return AVERROR(ENOMEM);
}
+ if (hls->key_info_file || hls->encrypt) {
+ av_dict_set(&options, "encryption_key", hls->key_string, 0);
+ av_dict_set(&options, "encryption_iv", hls->iv_string, 0);
+ filename = av_asprintf("crypto:%s", oc->url);
+ } else {
+ filename = av_asprintf("%s", oc->url);
+ }
+ if (!filename) {
+ av_freep(&old_filename);
+ return AVERROR(ENOMEM);
+ }
+
if ( hls->segment_type == SEGMENT_TYPE_FMP4) {
int range_length = 0;
if (!vs->init_range_length) {
uint8_t *buffer = NULL;
- int range_length, byterange_mode;
- av_write_frame(vs->avf, NULL); /* Flush any buffered data */
- avio_flush(oc->pb);
+ av_write_frame(oc, NULL); /* Flush any buffered data */
range_length = avio_close_dyn_buf(oc->pb, &buffer);
avio_write(vs->out, buffer, range_length);
- av_free(buffer);
+ av_freep(&buffer);
vs->init_range_length = range_length;
avio_open_dyn_buf(&oc->pb);
vs->packets_written = 0;
hlsenc_io_close(s, &vs->out, vs->base_output_dirname);
}
}
- if (!(hls->flags & HLS_SINGLE_FILE)) {
- ret = hlsenc_io_open(s, &vs->out, vs->avf->url, NULL);
- if (ret < 0) {
- av_log(s, AV_LOG_ERROR, "Failed to open file '%s'\n", vs->avf->url);
- goto failed;
- }
- write_styp(vs->out);
- }
- ret = flush_dynbuf(vs, &range_length);
+ }
+ if (!(hls->flags & HLS_SINGLE_FILE)) {
+ set_http_options(s, &options, hls);
+ ret = hlsenc_io_open(s, &vs->out, filename, &options);
if (ret < 0) {
+ av_log(s, AV_LOG_ERROR, "Failed to open file '%s'\n", oc->url);
goto failed;
}
- vs->size = range_length;
+ if (hls->segment_type == SEGMENT_TYPE_FMP4)
+ write_styp(vs->out);
+ }
+ ret = flush_dynbuf(vs, &range_length);
+ if (ret < 0)
+ goto failed;
+
+ vs->size = range_length;
+ hlsenc_io_close(s, &vs->out, filename);
+ ret = hlsenc_io_close(s, &vs->out, filename);
+ if (ret < 0) {
+ av_log(s, AV_LOG_WARNING, "upload segment failed, will retry with a new http session.\n");
ff_format_io_close(s, &vs->out);
+ ret = hlsenc_io_open(s, &vs->out, filename, &options);
+ if (ret < 0) {
+ av_log(s, AV_LOG_ERROR, "Failed to open file '%s'\n", oc->url);
+ goto failed;
+ }
+ reflush_dynbuf(vs, &range_length);
+ ret = hlsenc_io_close(s, &vs->out, filename);
+ 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(&filename);
av_write_trailer(oc);
-
if (oc->url[0]) {
proto = avio_find_protocol_name(oc->url);
use_temp_file = proto && !strcmp(proto, "file") && (hls->flags & HLS_TEMP_FILE);
}
- if (oc->pb) {
- if (hls->segment_type != SEGMENT_TYPE_FMP4) {
- vs->size = avio_tell(vs->avf->pb) - vs->start_pos;
- ff_format_io_close(s, &oc->pb);
- }
-
- // rename that segment from .tmp to the real one
- if (use_temp_file && !(hls->flags & HLS_SINGLE_FILE)) {
- hls_rename_temp_file(s, oc);
- av_free(old_filename);
- old_filename = av_strdup(vs->avf->url);
+ // rename that segment from .tmp to the real one
+ if (use_temp_file && !(hls->flags & HLS_SINGLE_FILE)) {
+ hls_rename_temp_file(s, oc);
+ av_freep(&old_filename);
+ old_filename = av_strdup(oc->url);
- if (!old_filename) {
- return AVERROR(ENOMEM);
- }
+ if (!old_filename) {
+ return AVERROR(ENOMEM);
}
-
- /* after av_write_trailer, then duration + 1 duration per packet */
- hls_append_segment(s, hls, vs, vs->duration + vs->dpp, vs->start_pos, vs->size);
}
+ /* after av_write_trailer, then duration + 1 duration per packet */
+ hls_append_segment(s, hls, vs, vs->duration + vs->dpp, vs->start_pos, vs->size);
+
sls_flag_file_rename(hls, vs, old_filename);
if (vtt_oc) {
av_write_trailer(vtt_oc);
vs->size = avio_tell(vs->vtt_avf->pb) - vs->start_pos;
ff_format_io_close(s, &vtt_oc->pb);
- avformat_free_context(vtt_oc);
}
- avformat_free_context(oc);
+ ret = hls_window(s, 1, vs);
+ if (ret < 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);
+ hls_window(s, 1, vs);
+ }
+ ffio_free_dyn_buf(&oc->pb);
- vs->avf = NULL;
- hls_window(s, 1, vs);
av_free(old_filename);
}
const char *vtt_pattern = "%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;
hls->has_default_key = 0;
goto fail;
}
+ if (!hls->method && http_base_proto) {
+ av_log(hls, AV_LOG_WARNING, "No HTTP method set, hls muxer defaulting to method PUT.\n");
+ }
+
ret = validate_name(hls->nb_varstreams, s->url);
if (ret < 0)
goto fail;
char b[15];
struct tm *p, tmbuf;
if (!(p = localtime_r(&t, &tmbuf)))
- return AVERROR(ENOMEM);
+ return AVERROR(errno);
if (!strftime(b, sizeof(b), "%Y%m%d%H%M%S", p))
return AVERROR(ENOMEM);
hls->start_sequence = strtoll(b, NULL, 10);
time(&now0);
vs->initial_prog_date_time = now0;
}
- if (hls->format_options_str) {
- ret = av_dict_parse_string(&hls->format_options, hls->format_options_str, "=", ":", 0);
- if (ret < 0) {
- av_log(s, AV_LOG_ERROR, "Could not parse format options list '%s'\n", hls->format_options_str);
- goto fail;
- }
- }
for (j = 0; j < vs->nb_streams; j++) {
vs->has_video += vs->streams[j]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO;
if (vs->has_subtitle) {
vs->vtt_oformat = av_guess_format("webvtt", NULL, NULL);
- if (!vs->oformat) {
+ if (!vs->vtt_oformat) {
ret = AVERROR_MUXER_NOT_FOUND;
goto fail;
}
ret = format_name(hls->segment_filename, &vs->basename, i, vs->varname);
if (ret < 0)
goto fail;
- basename_size = strlen(vs->basename) + 1;
} else {
if (hls->flags & HLS_SINGLE_FILE) {
if (hls->segment_type == SEGMENT_TYPE_FMP4) {
}
}
- if (!hls->use_localtime) {
- ret = sls_flag_check_duration_size_index(hls);
- if (ret < 0) {
- goto fail;
- }
- } else {
- ret = sls_flag_check_duration_size(hls, vs);
- if (ret < 0) {
- goto fail;
- }
- }
+ ret = hls->use_localtime ? sls_flag_check_duration_size(hls, vs) : sls_flag_check_duration_size_index(hls);
+ if (ret < 0)
+ goto fail;
+
if (vs->has_subtitle) {
if (hls->flags & HLS_SINGLE_FILE)
ret = AVERROR(ENOMEM);
goto fail;
}
- vs->vtt_m3u8_name = av_malloc(vtt_basename_size);
- if (!vs->vtt_m3u8_name ) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
av_strlcpy(vs->vtt_basename, vs->m3u8_name, vtt_basename_size);
p = strrchr(vs->vtt_basename, '.');
if (p)
*p = '\0';
if ( hls->subtitle_filename ) {
- av_freep(&vs->vtt_m3u8_name);
ret = format_name(hls->subtitle_filename, &vs->vtt_m3u8_name, i, vs->varname);
if (ret < 0)
goto fail;
} else {
+ vs->vtt_m3u8_name = av_malloc(vtt_basename_size);
+ if (!vs->vtt_m3u8_name) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
strcpy(vs->vtt_m3u8_name, vs->vtt_basename);
av_strlcat(vs->vtt_m3u8_name, "_vtt.m3u8", vtt_basename_size);
}
fail:
if (ret < 0) {
- av_freep(&hls->key_basename);
- for (i = 0; i < hls->nb_varstreams && hls->var_streams; i++) {
- vs = &hls->var_streams[i];
- av_freep(&vs->basename);
- av_freep(&vs->vtt_basename);
- av_freep(&vs->fmp4_init_filename);
- av_freep(&vs->m3u8_name);
- av_freep(&vs->vtt_m3u8_name);
- av_freep(&vs->streams);
- av_freep(&vs->language);
- av_freep(&vs->agroup);
- av_freep(&vs->ccgroup);
- av_freep(&vs->baseurl);
- av_freep(&vs->varname);
- if (vs->avf)
- avformat_free_context(vs->avf);
- if (vs->vtt_avf)
- avformat_free_context(vs->vtt_avf);
- }
+ hls_free_variant_streams(hls);
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);
}
+ av_freep(&hls->key_basename);
av_freep(&hls->var_streams);
av_freep(&hls->cc_streams);
av_freep(&hls->master_m3u8_url);
{"hls_init_time", "set segment length in seconds at init list", OFFSET(init_time), AV_OPT_TYPE_FLOAT, {.dbl = 0}, 0, FLT_MAX, E},
{"hls_list_size", "set maximum number of playlist entries", OFFSET(max_nb_segments), AV_OPT_TYPE_INT, {.i64 = 5}, 0, INT_MAX, E},
{"hls_delete_threshold", "set number of unreferenced segments to keep before deleting", OFFSET(hls_delete_threshold), AV_OPT_TYPE_INT, {.i64 = 1}, 1, INT_MAX, E},
- {"hls_ts_options","set hls mpegts list of options for the container format used for hls", OFFSET(format_options_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E},
+ {"hls_ts_options","set hls mpegts list of options for the container format used for hls", OFFSET(format_options), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, E},
{"hls_vtt_options","set hls vtt list of options for the container format used for hls", OFFSET(vtt_format_options_str), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E},
#if FF_API_HLS_WRAP
{"hls_wrap", "set number after which the index wraps (will be deprecated)", OFFSET(wrap), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E},
projects / ffmpeg / blobdiff