SEGMENT_TYPE_NB
} SegmentType;
+enum {
+ FRAG_TYPE_NONE = 0,
+ FRAG_TYPE_EVERY_FRAME,
+ FRAG_TYPE_DURATION,
+ FRAG_TYPE_PFRAMES,
+ FRAG_TYPE_NB
+};
+
+#define MPD_PROFILE_DASH 1
+#define MPD_PROFILE_DVB 2
+
typedef struct Segment {
char file[1024];
int64_t start_pos;
char id[10];
char *descriptor;
int64_t seg_duration;
+ int64_t frag_duration;
+ int frag_type;
enum AVMediaType media_type;
AVDictionary *metadata;
AVRational min_frame_rate, max_frame_rate;
int ambiguous_frame_rate;
+ int64_t max_frag_duration;
+ int max_width, max_height;
+ int nb_streams;
+ AVRational par;
} AdaptationSet;
typedef struct OutputStream {
AVFormatContext *ctx;
int ctx_inited, as_idx;
AVIOContext *out;
+ AVCodecParserContext *parser;
+ AVCodecContext *parser_avctx;
int packets_written;
char initfile[1024];
int64_t init_start_pos, pos;
int init_range_length;
int nb_segments, segments_size, segment_index;
int64_t seg_duration;
+ int64_t frag_duration;
int64_t last_duration;
Segment **segments;
int64_t first_pts, start_pts, max_pts;
int64_t last_dts, last_pts;
+ int last_flags;
int bit_rate;
SegmentType segment_type; /* segment type selected for this particular stream */
const char *format_name;
char full_path[1024];
char temp_path[1024];
double availability_time_offset;
+ int64_t producer_reference_time;
+ char producer_reference_time_str[100];
int total_pkt_size;
+ int64_t total_pkt_duration;
int muxer_overhead;
+ int frag_type;
+ int64_t gop_size;
+ AVRational sar;
} OutputStream;
typedef struct DASHContext {
int min_seg_duration;
#endif
int64_t seg_duration;
+ int64_t frag_duration;
int remove_at_exit;
int use_template;
int use_timeline;
int64_t total_duration;
char availability_start_time[100];
time_t start_time_s;
+ int64_t presentation_time_offset;
char dirname[1024];
const char *single_file_name; /* file names as specified in options */
const char *init_seg_name;
const char *utc_timing_url;
const char *method;
const char *user_agent;
+ AVDictionary *http_opts;
int hls_playlist;
int http_persistent;
int master_playlist_created;
SegmentType segment_type_option; /* segment type as specified in options */
int ignore_io_errors;
int lhls;
+ int ldash;
int master_publish_rate;
int nr_of_streams_to_flush;
int nr_of_streams_flushed;
+ int frag_type;
+ int write_prft;
+ int64_t max_gop_size;
+ int profile;
+ int64_t target_latency;
+ int target_latency_refid;
} DASHContext;
static struct codec_string {
{
if (c->method)
av_dict_set(options, "method", c->method, 0);
+ av_dict_copy(options, c->http_opts, 0);
if (c->user_agent)
av_dict_set(options, "user_agent", c->user_agent, 0);
if (c->http_persistent)
dashenc_io_close(s, &c->m3u8_out, temp_filename_hls);
if (use_rename)
- if (avpriv_io_move(temp_filename_hls, filename_hls) < 0) {
- av_log(os->ctx, AV_LOG_WARNING, "renaming file %s to %s failed\n\n", temp_filename_hls, filename_hls);
- }
+ ff_rename(temp_filename_hls, filename_hls, os->ctx);
}
static int flush_init_segment(AVFormatContext *s, OutputStream *os)
}
ff_format_io_close(s, &os->out);
avformat_free_context(os->ctx);
+ avcodec_free_context(&os->parser_avctx);
+ av_parser_close(os->parser);
for (j = 0; j < os->nb_segments; j++)
av_free(os->segments[j]);
av_free(os->segments);
avio_printf(out, "availabilityTimeOffset=\"%.3f\" ",
os->availability_time_offset);
}
- avio_printf(out, "initialization=\"%s\" media=\"%s\" startNumber=\"%d\">\n", os->init_seg_name, os->media_seg_name, c->use_timeline ? start_number : 1);
+ if (c->ldash && !final && os->frag_type != FRAG_TYPE_NONE &&
+ (os->frag_type != FRAG_TYPE_DURATION || os->frag_duration != os->seg_duration))
+ avio_printf(out, "availabilityTimeComplete=\"false\" ");
+
+ avio_printf(out, "initialization=\"%s\" media=\"%s\" startNumber=\"%d\"", os->init_seg_name, os->media_seg_name, c->use_timeline ? start_number : 1);
+ if (c->presentation_time_offset)
+ avio_printf(out, " presentationTimeOffset=\"%"PRId64"\"", c->presentation_time_offset);
+ avio_printf(out, ">\n");
if (c->use_timeline) {
int64_t cur_time = 0;
avio_printf(out, "\t\t\t\t\t<SegmentTimeline>\n");
avio_printf(out, "%d.%dS", seconds, fractions / (AV_TIME_BASE / 10));
}
-static void format_date_now(char *buf, int size)
+static void format_date(char *buf, int size, int64_t time_us)
{
struct tm *ptm, tmbuf;
- int64_t time_us = av_gettime();
int64_t time_ms = time_us / 1000;
const time_t time_s = time_ms / 1000;
int millisec = time_ms - (time_s * 1000);
as->id, as->media_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio");
if (as->media_type == AVMEDIA_TYPE_VIDEO && as->max_frame_rate.num && !as->ambiguous_frame_rate && av_cmp_q(as->min_frame_rate, as->max_frame_rate) < 0)
avio_printf(out, " maxFrameRate=\"%d/%d\"", as->max_frame_rate.num, as->max_frame_rate.den);
+ else if (as->media_type == AVMEDIA_TYPE_VIDEO && as->max_frame_rate.num && !as->ambiguous_frame_rate && !av_cmp_q(as->min_frame_rate, as->max_frame_rate))
+ avio_printf(out, " frameRate=\"%d/%d\"", as->max_frame_rate.num, as->max_frame_rate.den);
+ if (as->media_type == AVMEDIA_TYPE_VIDEO) {
+ avio_printf(out, " maxWidth=\"%d\" maxHeight=\"%d\"", as->max_width, as->max_height);
+ avio_printf(out, " par=\"%d:%d\"", as->par.num, as->par.den);
+ }
lang = av_dict_get(as->metadata, "language", NULL, 0);
if (lang)
avio_printf(out, " lang=\"%s\"", lang->value);
avio_printf(out, ">\n");
+ if (!final && c->ldash && as->max_frag_duration)
+ avio_printf(out, "\t\t\t<Resync dT=\"%"PRId64"\" type=\"0\"/>\n", as->max_frag_duration);
role = av_dict_get(as->metadata, "role", NULL, 0);
if (role)
avio_printf(out, "\t\t\t<Role schemeIdUri=\"urn:mpeg:dash:role:2011\" value=\"%s\"/>\n", role->value);
if (as->descriptor)
avio_printf(out, "\t\t\t%s\n", as->descriptor);
for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
OutputStream *os = &c->streams[i];
char bandwidth_str[64] = {'\0'};
os->bit_rate);
if (as->media_type == AVMEDIA_TYPE_VIDEO) {
- AVStream *st = s->streams[i];
avio_printf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"video/%s\" codecs=\"%s\"%s width=\"%d\" height=\"%d\"",
i, os->format_name, os->codec_str, bandwidth_str, s->streams[i]->codecpar->width, s->streams[i]->codecpar->height);
- if (st->avg_frame_rate.num)
+ if (st->codecpar->field_order == AV_FIELD_UNKNOWN)
+ avio_printf(out, " scanType=\"unknown\"");
+ else if (st->codecpar->field_order != AV_FIELD_PROGRESSIVE)
+ avio_printf(out, " scanType=\"interlaced\"");
+ avio_printf(out, " sar=\"%d:%d\"", os->sar.num, os->sar.den);
+ if (st->avg_frame_rate.num && av_cmp_q(as->min_frame_rate, as->max_frame_rate) < 0)
avio_printf(out, " frameRate=\"%d/%d\"", st->avg_frame_rate.num, st->avg_frame_rate.den);
avio_printf(out, ">\n");
} else {
avio_printf(out, "\t\t\t\t<AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\" />\n",
s->streams[i]->codecpar->channels);
}
+ if (!final && c->write_prft && os->producer_reference_time_str[0]) {
+ avio_printf(out, "\t\t\t\t<ProducerReferenceTime id=\"%d\" inband=\"true\" type=\"encoder\" wallclockTime=\"%s\" presentationTime=\"%"PRId64"\">\n",
+ i, os->producer_reference_time_str, c->presentation_time_offset);
+ avio_printf(out, "\t\t\t\t\t<UTCTiming schemeIdUri=\"urn:mpeg:dash:utc:http-xsdate:2014\" value=\"%s\"/>\n", c->utc_timing_url);
+ avio_printf(out, "\t\t\t\t</ProducerReferenceTime>\n");
+ }
+ if (!final && c->ldash && os->gop_size && os->frag_type != FRAG_TYPE_NONE &&
+ (os->frag_type != FRAG_TYPE_DURATION || os->frag_duration != os->seg_duration))
+ avio_printf(out, "\t\t\t\t<Resync dT=\"%"PRId64"\" type=\"1\"/>\n", os->gop_size);
output_segment_list(os, out, s, i, final);
avio_printf(out, "\t\t\t</Representation>\n");
}
static int add_adaptation_set(AVFormatContext *s, AdaptationSet **as, enum AVMediaType type)
{
DASHContext *c = s->priv_data;
+ void *mem;
- void *mem = av_realloc(c->as, sizeof(*c->as) * (c->nb_as + 1));
+ if (c->profile & MPD_PROFILE_DVB && (c->nb_as + 1) > 16) {
+ av_log(s, AV_LOG_ERROR, "DVB-DASH profile allows a max of 16 Adaptation Sets\n");
+ return AVERROR(EINVAL);
+ }
+ mem = av_realloc(c->as, sizeof(*c->as) * (c->nb_as + 1));
if (!mem)
return AVERROR(ENOMEM);
c->as = mem;
*as = &c->as[c->nb_as - 1];
memset(*as, 0, sizeof(**as));
(*as)->media_type = type;
+ (*as)->frag_type = -1;
return 0;
}
av_log(s, AV_LOG_ERROR, "Stream %d is already assigned to an AdaptationSet\n", i);
return AVERROR(EINVAL);
}
+ if (c->profile & MPD_PROFILE_DVB && (as->nb_streams + 1) > 16) {
+ av_log(s, AV_LOG_ERROR, "DVB-DASH profile allows a max of 16 Representations per Adaptation Set\n");
+ return AVERROR(EINVAL);
+ }
os->as_idx = as_idx;
+ ++as->nb_streams;
return 0;
}
{
DASHContext *c = s->priv_data;
const char *p = c->adaptation_sets;
- enum { new_set, parse_id, parsing_streams, parse_descriptor, parse_seg_duration } state;
+ enum { new_set, parse_default, parsing_streams, parse_seg_duration, parse_frag_duration } state;
AdaptationSet *as;
int i, n, ret;
snprintf(as->id, sizeof(as->id), "%d", i);
c->streams[i].as_idx = c->nb_as;
+ ++as->nb_streams;
}
goto end;
}
// syntax id=0,streams=0,1,2 id=1,streams=3,4 and so on
// option id=0,descriptor=descriptor_str,streams=0,1,2 and so on
- // option id=0,seg_duration=2.5,streams=0,1,2 and so on
+ // option id=0,seg_duration=2.5,frag_duration=0.5,streams=0,1,2 and so on
// descriptor is useful to the scheme defined by ISO/IEC 23009-1:2014/Amd.2:2015
// descriptor_str should be a self-closing xml tag.
- // seg_duration has the same syntax as the global seg_duration option, and has
- // precedence over it if set.
+ // seg_duration and frag_duration have the same syntax as the global options of
+ // the same name, and the former have precedence over them if set.
state = new_set;
while (*p) {
if (*p == ' ') {
p += n;
if (*p)
p++;
- state = parse_id;
+ state = parse_default;
} else if (state != new_set && av_strstart(p, "seg_duration=", &p)) {
+ state = parse_seg_duration;
+ } else if (state != new_set && av_strstart(p, "frag_duration=", &p)) {
+ state = parse_frag_duration;
+ } else if (state == parse_seg_duration || state == parse_frag_duration) {
char str[32];
int64_t usecs = 0;
return ret;
}
- as->seg_duration = usecs;
- state = parse_seg_duration;
+ if (state == parse_seg_duration)
+ as->seg_duration = usecs;
+ else
+ as->frag_duration = usecs;
+ state = parse_default;
+ } else if (state != new_set && av_strstart(p, "frag_type=", &p)) {
+ char type_str[16];
+
+ n = strcspn(p, ",");
+ snprintf(type_str, sizeof(type_str), "%.*s", n, p);
+ p += n;
+ if (*p)
+ p++;
+
+ if (!strcmp(type_str, "duration"))
+ as->frag_type = FRAG_TYPE_DURATION;
+ else if (!strcmp(type_str, "pframes"))
+ as->frag_type = FRAG_TYPE_PFRAMES;
+ else if (!strcmp(type_str, "every_frame"))
+ as->frag_type = FRAG_TYPE_EVERY_FRAME;
+ else if (!strcmp(type_str, "none"))
+ as->frag_type = FRAG_TYPE_NONE;
+ else {
+ av_log(s, AV_LOG_ERROR, "Unable to parse option value \"%s\" as fragment type\n", type_str);
+ return ret;
+ }
+ state = parse_default;
} else if (state != new_set && av_strstart(p, "descriptor=", &p)) {
n = strcspn(p, ">") + 1; //followed by one comma, so plus 1
if (n < strlen(p)) {
p += n;
if (*p)
p++;
- state = parse_descriptor;
- } else if ((state != new_set) && av_strstart(p, "streams=", &p)) { //descriptor and duration are optional
+ state = parse_default;
+ } else if ((state != new_set) && av_strstart(p, "streams=", &p)) { //descriptor and durations are optional
state = parsing_streams;
} else if (state == parsing_streams) {
AdaptationSet *as = &c->as[c->nb_as - 1];
"\txmlns=\"urn:mpeg:dash:schema:mpd:2011\"\n"
"\txmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"
"\txsi:schemaLocation=\"urn:mpeg:DASH:schema:MPD:2011 http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-DASH_schema_files/DASH-MPD.xsd\"\n"
- "\tprofiles=\"urn:mpeg:dash:profile:isoff-live:2011\"\n"
- "\ttype=\"%s\"\n", final ? "static" : "dynamic");
+ "\tprofiles=\"");
+ if (c->profile & MPD_PROFILE_DASH)
+ avio_printf(out, "%s%s", "urn:mpeg:dash:profile:isoff-live:2011", c->profile & MPD_PROFILE_DVB ? "," : "\"\n");
+ if (c->profile & MPD_PROFILE_DVB)
+ avio_printf(out, "%s", "urn:dvb:dash:profile:dvb-dash:2014\"\n");
+ avio_printf(out, "\ttype=\"%s\"\n",
+ final ? "static" : "dynamic");
if (final) {
avio_printf(out, "\tmediaPresentationDuration=\"");
write_time(out, c->total_duration);
if (c->use_template && !c->use_timeline)
update_period = 500;
avio_printf(out, "\tminimumUpdatePeriod=\"PT%"PRId64"S\"\n", update_period);
- avio_printf(out, "\tsuggestedPresentationDelay=\"PT%"PRId64"S\"\n", c->last_duration / AV_TIME_BASE);
+ if (!c->ldash)
+ avio_printf(out, "\tsuggestedPresentationDelay=\"PT%"PRId64"S\"\n", c->last_duration / AV_TIME_BASE);
if (c->availability_start_time[0])
avio_printf(out, "\tavailabilityStartTime=\"%s\"\n", c->availability_start_time);
- format_date_now(now_str, sizeof(now_str));
+ format_date(now_str, sizeof(now_str), av_gettime());
if (now_str[0])
avio_printf(out, "\tpublishTime=\"%s\"\n", now_str);
if (c->window_size && c->use_template) {
}
}
avio_printf(out, "\tminBufferTime=\"");
- write_time(out, c->last_duration * 2);
+ write_time(out, c->ldash && c->max_gop_size ? c->max_gop_size : c->last_duration * 2);
avio_printf(out, "\">\n");
avio_printf(out, "\t<ProgramInformation>\n");
if (title) {
av_free(escaped);
}
avio_printf(out, "\t</ProgramInformation>\n");
+ if (!final && c->target_latency && c->target_latency_refid >= 0) {
+ avio_printf(out, "\t<ServiceDescription id=\"0\">\n");
+ avio_printf(out, "\t\t<Latency target=\"%"PRId64"\"", c->target_latency / 1000);
+ if (s->nb_streams > 1)
+ avio_printf(out, " referenceId=\"%d\"", c->target_latency_refid);
+ avio_printf(out, "/>\n");
+ avio_printf(out, "\t</ServiceDescription>\n");
+ }
if (c->window_size && s->nb_streams > 0 && c->streams[0].nb_segments > 0 && !c->use_template) {
OutputStream *os = &c->streams[0];
dashenc_io_close(s, &c->mpd_out, temp_filename);
if (use_rename) {
- if ((ret = avpriv_io_move(temp_filename, s->url)) < 0)
+ if ((ret = ff_rename(temp_filename, s->url, s)) < 0)
return ret;
}
}
dashenc_io_close(s, &c->m3u8_out, temp_filename);
if (use_rename)
- if ((ret = avpriv_io_move(temp_filename, filename_hls)) < 0)
+ if ((ret = ff_rename(temp_filename, filename_hls, s)) < 0)
return ret;
c->master_playlist_created = 1;
}
if (c->single_file)
c->use_template = 0;
+ if (!c->profile) {
+ av_log(s, AV_LOG_ERROR, "At least one profile must be enabled.\n");
+ return AVERROR(EINVAL);
+ }
#if FF_API_DASH_MIN_SEG_DURATION
if (c->min_seg_duration != 5000000) {
av_log(s, AV_LOG_WARNING, "The min_seg_duration option is deprecated and will be removed. Please use the -seg_duration\n");
c->lhls = 0;
}
+ if (c->ldash && !c->streaming) {
+ av_log(s, AV_LOG_WARNING, "LDash option will be ignored as streaming is not enabled\n");
+ c->ldash = 0;
+ }
+
+ if (c->target_latency && !c->streaming) {
+ av_log(s, AV_LOG_WARNING, "Target latency option will be ignored as streaming is not enabled\n");
+ c->target_latency = 0;
+ }
+
if (c->global_sidx && !c->single_file) {
av_log(s, AV_LOG_WARNING, "Global SIDX option will be ignored as single_file is not enabled\n");
c->global_sidx = 0;
av_log(s, AV_LOG_WARNING, "Global SIDX option will be ignored as streaming is enabled\n");
c->global_sidx = 0;
}
+ if (c->frag_type == FRAG_TYPE_NONE && c->streaming) {
+ av_log(s, AV_LOG_VERBOSE, "Changing frag_type from none to every_frame as streaming is enabled\n");
+ c->frag_type = FRAG_TYPE_EVERY_FRAME;
+ }
+
+ if (c->write_prft && !c->utc_timing_url) {
+ av_log(s, AV_LOG_WARNING, "Producer Reference Time element option will be ignored as utc_timing_url is not set\n");
+ c->write_prft = 0;
+ }
+
+ if (c->write_prft && !c->streaming) {
+ av_log(s, AV_LOG_WARNING, "Producer Reference Time element option will be ignored as streaming is not enabled\n");
+ c->write_prft = 0;
+ }
+
+ if (c->target_latency && !c->write_prft) {
+ av_log(s, AV_LOG_WARNING, "Target latency option will be ignored as Producer Reference Time element will not be written\n");
+ c->target_latency = 0;
+ }
av_strlcpy(c->dirname, s->url, sizeof(c->dirname));
ptr = strrchr(c->dirname, '/');
ctx->avoid_negative_ts = s->avoid_negative_ts;
ctx->flags = s->flags;
+ os->parser = av_parser_init(st->codecpar->codec_id);
+ if (os->parser) {
+ os->parser_avctx = avcodec_alloc_context3(NULL);
+ if (!os->parser_avctx)
+ return AVERROR(ENOMEM);
+ ret = avcodec_parameters_to_context(os->parser_avctx, st->codecpar);
+ if (ret < 0)
+ return ret;
+ // We only want to parse frame headers
+ os->parser->flags |= PARSER_FLAG_COMPLETE_FRAMES;
+ }
+
if (c->single_file) {
if (os->single_file_name)
ff_dash_fill_tmpl_params(os->initfile, sizeof(os->initfile), os->single_file_name, i, 0, os->bit_rate, 0);
os->init_start_pos = 0;
av_dict_copy(&opts, c->format_options, 0);
- os->seg_duration = as->seg_duration ? as->seg_duration : c->seg_duration;
+ if (!as->seg_duration)
+ as->seg_duration = c->seg_duration;
+ if (!as->frag_duration)
+ as->frag_duration = c->frag_duration;
+ if (as->frag_type < 0)
+ as->frag_type = c->frag_type;
+ os->seg_duration = as->seg_duration;
+ os->frag_duration = as->frag_duration;
+ os->frag_type = as->frag_type;
+
+ if (c->profile & MPD_PROFILE_DVB && (os->seg_duration > 15000000 || os->seg_duration < 960000)) {
+ av_log(s, AV_LOG_ERROR, "Segment duration %"PRId64" is outside the allowed range for DVB-DASH profile\n", os->seg_duration);
+ return AVERROR(EINVAL);
+ }
+
+ if (os->frag_type == FRAG_TYPE_DURATION && !os->frag_duration) {
+ av_log(s, AV_LOG_WARNING, "frag_type set to duration for stream %d but no frag_duration set\n", i);
+ os->frag_type = c->streaming ? FRAG_TYPE_EVERY_FRAME : FRAG_TYPE_NONE;
+ }
+ if (os->frag_type == FRAG_TYPE_DURATION && os->frag_duration > os->seg_duration) {
+ av_log(s, AV_LOG_ERROR, "Fragment duration %"PRId64" is longer than Segment duration %"PRId64"\n", os->frag_duration, os->seg_duration);
+ return AVERROR(EINVAL);
+ }
+ if (os->frag_type == FRAG_TYPE_PFRAMES && (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO || !os->parser)) {
+ if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && !os->parser)
+ av_log(s, AV_LOG_WARNING, "frag_type set to P-Frame reordering, but no parser found for stream %d\n", i);
+ os->frag_type = c->streaming ? FRAG_TYPE_EVERY_FRAME : FRAG_TYPE_NONE;
+ }
if (os->segment_type == SEGMENT_TYPE_MP4) {
if (c->streaming)
- // frag_every_frame : Allows lower latency streaming
// skip_sidx : Reduce bitrate overhead
// skip_trailer : Avoids growing memory usage with time
- av_dict_set(&opts, "movflags", "frag_every_frame+dash+delay_moov+skip_sidx+skip_trailer", 0);
+ av_dict_set(&opts, "movflags", "+dash+delay_moov+skip_sidx+skip_trailer", AV_DICT_APPEND);
else {
if (c->global_sidx)
- av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov+global_sidx+skip_trailer", 0);
+ av_dict_set(&opts, "movflags", "+dash+delay_moov+global_sidx+skip_trailer", AV_DICT_APPEND);
else
- av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov+skip_trailer", 0);
+ av_dict_set(&opts, "movflags", "+dash+delay_moov+skip_trailer", AV_DICT_APPEND);
}
+ if (os->frag_type == FRAG_TYPE_EVERY_FRAME)
+ av_dict_set(&opts, "movflags", "+frag_every_frame", AV_DICT_APPEND);
+ else
+ av_dict_set(&opts, "movflags", "+frag_custom", AV_DICT_APPEND);
+ if (os->frag_type == FRAG_TYPE_DURATION)
+ av_dict_set_int(&opts, "frag_duration", os->frag_duration, 0);
+ if (c->write_prft)
+ av_dict_set(&opts, "write_prft", "wallclock", 0);
} else {
av_dict_set_int(&opts, "cluster_time_limit", c->seg_duration / 1000, 0);
av_dict_set_int(&opts, "cluster_size_limit", 5 * 1024 * 1024, 0); // set a large cluster size limit
s->avoid_negative_ts = ctx->avoid_negative_ts;
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
AVRational avg_frame_rate = s->streams[i]->avg_frame_rate;
+ AVRational par;
if (avg_frame_rate.num > 0) {
if (av_cmp_q(avg_frame_rate, as->min_frame_rate) < 0)
as->min_frame_rate = avg_frame_rate;
} else {
as->ambiguous_frame_rate = 1;
}
+
+ if (st->codecpar->width > as->max_width)
+ as->max_width = st->codecpar->width;
+ if (st->codecpar->height > as->max_height)
+ as->max_height = st->codecpar->height;
+
+ if (st->sample_aspect_ratio.num)
+ os->sar = st->sample_aspect_ratio;
+ else
+ os->sar = (AVRational){1,1};
+ av_reduce(&par.num, &par.den,
+ st->codecpar->width * (int64_t)os->sar.num,
+ st->codecpar->height * (int64_t)os->sar.den,
+ 1024 * 1024);
+
+ if (as->par.num && av_cmp_q(par, as->par)) {
+ av_log(s, AV_LOG_ERROR, "Conflicting stream par values in Adaptation Set %d\n", os->as_idx);
+ return AVERROR(EINVAL);
+ }
+ as->par = par;
+
c->has_video = 1;
}
av_log(s, AV_LOG_WARNING, "no video stream and no seg duration set\n");
return AVERROR(EINVAL);
}
+ if (!c->has_video && c->frag_type == FRAG_TYPE_PFRAMES)
+ av_log(s, AV_LOG_WARNING, "no video stream and P-frame fragmentation set\n");
c->nr_of_streams_flushed = 0;
+ c->target_latency_refid = -1;
return 0;
}
dashenc_io_close(s, &os->out, os->temp_path);
if (use_rename) {
- ret = avpriv_io_move(os->temp_path, os->full_path);
+ ret = ff_rename(os->temp_path, os->full_path, os->ctx);
if (ret < 0)
break;
}
st->time_base,
AV_TIME_BASE_Q));
- if (!os->muxer_overhead)
+ if (!os->muxer_overhead && os->max_pts > os->start_pts)
os->muxer_overhead = ((int64_t) (range_length - os->total_pkt_size) *
8 * AV_TIME_BASE) /
av_rescale_q(os->max_pts - os->start_pts,
st->time_base, AV_TIME_BASE_Q);
os->total_pkt_size = 0;
+ os->total_pkt_duration = 0;
if (!os->bit_rate) {
// calculate average bitrate of first segment
DASHContext *c = s->priv_data;
AVStream *st = s->streams[pkt->stream_index];
OutputStream *os = &c->streams[pkt->stream_index];
+ AdaptationSet *as = &c->as[os->as_idx - 1];
int64_t seg_end_duration, elapsed_duration;
int ret;
pkt->dts = 0;
}
- if (os->first_pts == AV_NOPTS_VALUE)
+ if (os->first_pts == AV_NOPTS_VALUE) {
+ int side_data_size;
+ AVProducerReferenceTime *prft = (AVProducerReferenceTime *)av_packet_get_side_data(pkt, AV_PKT_DATA_PRFT,
+ &side_data_size);
+ if (prft && side_data_size == sizeof(AVProducerReferenceTime) && !prft->flags) {
+ os->producer_reference_time = prft->wallclock;
+ if (c->target_latency_refid < 0)
+ c->target_latency_refid = pkt->stream_index;
+ }
os->first_pts = pkt->pts;
+ }
os->last_pts = pkt->pts;
if (!c->availability_start_time[0]) {
int64_t start_time_us = av_gettime();
c->start_time_s = start_time_us / 1000000;
- format_date_now(c->availability_start_time,
- sizeof(c->availability_start_time));
+ format_date(c->availability_start_time,
+ sizeof(c->availability_start_time), start_time_us);
}
- if (!os->availability_time_offset && pkt->duration) {
- int64_t frame_duration = av_rescale_q(pkt->duration, st->time_base,
- AV_TIME_BASE_Q);
+ if (!os->packets_written)
+ os->availability_time_offset = 0;
+
+ if (!os->availability_time_offset &&
+ ((os->frag_type == FRAG_TYPE_DURATION && os->seg_duration != os->frag_duration) ||
+ (os->frag_type == FRAG_TYPE_EVERY_FRAME && pkt->duration))) {
+ int64_t frame_duration = 0;
+
+ switch (os->frag_type) {
+ case FRAG_TYPE_DURATION:
+ frame_duration = os->frag_duration;
+ break;
+ case FRAG_TYPE_EVERY_FRAME:
+ frame_duration = av_rescale_q(pkt->duration, st->time_base, AV_TIME_BASE_Q);
+ break;
+ }
+
os->availability_time_offset = ((double) os->seg_duration -
frame_duration) / AV_TIME_BASE;
+ as->max_frag_duration = FFMAX(frame_duration, as->max_frag_duration);
}
if (c->use_template && !c->use_timeline) {
}
}
+ if (c->write_prft && os->producer_reference_time && !os->producer_reference_time_str[0])
+ format_date(os->producer_reference_time_str,
+ sizeof(os->producer_reference_time_str),
+ os->producer_reference_time);
+
if ((ret = dash_flush(s, 0, pkt->stream_index)) < 0)
return ret;
}
os->max_pts = pkt->pts + pkt->duration;
else
os->max_pts = FFMAX(os->max_pts, pkt->pts + pkt->duration);
- os->packets_written++;
- os->total_pkt_size += pkt->size;
+
+ if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO &&
+ os->frag_type == FRAG_TYPE_PFRAMES &&
+ os->packets_written) {
+ uint8_t *data;
+ int size;
+
+ av_assert0(os->parser);
+ av_parser_parse2(os->parser, os->parser_avctx,
+ &data, &size, pkt->data, pkt->size,
+ pkt->pts, pkt->dts, pkt->pos);
+
+ if ((os->parser->pict_type == AV_PICTURE_TYPE_P &&
+ st->codecpar->video_delay &&
+ !(os->last_flags & AV_PKT_FLAG_KEY)) ||
+ pkt->flags & AV_PKT_FLAG_KEY) {
+ ret = av_write_frame(os->ctx, NULL);
+ if (ret < 0)
+ return ret;
+
+ if (!os->availability_time_offset) {
+ int64_t frag_duration = av_rescale_q(os->total_pkt_duration, st->time_base,
+ AV_TIME_BASE_Q);
+ os->availability_time_offset = ((double) os->seg_duration -
+ frag_duration) / AV_TIME_BASE;
+ as->max_frag_duration = FFMAX(frag_duration, as->max_frag_duration);
+ }
+ }
+ }
+
+ if (pkt->flags & AV_PKT_FLAG_KEY && (os->packets_written || os->nb_segments) && !os->gop_size) {
+ os->gop_size = os->last_duration + av_rescale_q(os->total_pkt_duration, st->time_base, AV_TIME_BASE_Q);
+ c->max_gop_size = FFMAX(c->max_gop_size, os->gop_size);
+ }
+
if ((ret = ff_write_chained(os->ctx, 0, pkt, s, 0)) < 0)
return ret;
+ os->packets_written++;
+ os->total_pkt_size += pkt->size;
+ os->total_pkt_duration += pkt->duration;
+ os->last_flags = pkt->flags;
+
if (!os->init_range_length)
flush_init_segment(s, os);
{ "min_seg_duration", "minimum segment duration (in microseconds) (will be deprecated)", OFFSET(min_seg_duration), AV_OPT_TYPE_INT, { .i64 = 5000000 }, 0, INT_MAX, E },
#endif
{ "seg_duration", "segment duration (in seconds, fractional value can be set)", OFFSET(seg_duration), AV_OPT_TYPE_DURATION, { .i64 = 5000000 }, 0, INT_MAX, E },
+ { "frag_duration", "fragment duration (in seconds, fractional value can be set)", OFFSET(frag_duration), AV_OPT_TYPE_DURATION, { .i64 = 0 }, 0, INT_MAX, E },
+ { "frag_type", "set type of interval for fragments", OFFSET(frag_type), AV_OPT_TYPE_INT, {.i64 = FRAG_TYPE_NONE }, 0, FRAG_TYPE_NB - 1, E, "frag_type"},
+ { "none", "one fragment per segment", 0, AV_OPT_TYPE_CONST, {.i64 = FRAG_TYPE_NONE }, 0, UINT_MAX, E, "frag_type"},
+ { "every_frame", "fragment at every frame", 0, AV_OPT_TYPE_CONST, {.i64 = FRAG_TYPE_EVERY_FRAME }, 0, UINT_MAX, E, "frag_type"},
+ { "duration", "fragment at specific time intervals", 0, AV_OPT_TYPE_CONST, {.i64 = FRAG_TYPE_DURATION }, 0, UINT_MAX, E, "frag_type"},
+ { "pframes", "fragment at keyframes and following P-Frame reordering (Video only, experimental)", 0, AV_OPT_TYPE_CONST, {.i64 = FRAG_TYPE_PFRAMES }, 0, UINT_MAX, E, "frag_type"},
{ "remove_at_exit", "remove all segments when finished", OFFSET(remove_at_exit), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },
{ "use_template", "Use SegmentTemplate instead of SegmentList", OFFSET(use_template), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, E },
{ "use_timeline", "Use SegmentTimeline in SegmentTemplate", OFFSET(use_timeline), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, E },
{ "webm", "make segment file in WebM format", 0, AV_OPT_TYPE_CONST, {.i64 = SEGMENT_TYPE_WEBM }, 0, UINT_MAX, E, "segment_type"},
{ "ignore_io_errors", "Ignore IO errors during open and write. Useful for long-duration runs with network output", OFFSET(ignore_io_errors), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },
{ "lhls", "Enable Low-latency HLS(Experimental). Adds #EXT-X-PREFETCH tag with current segment's URI", OFFSET(lhls), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },
+ { "ldash", "Enable Low-latency dash. Constrains the value of a few elements", OFFSET(ldash), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },
{ "master_m3u8_publish_rate", "Publish master playlist every after this many segment intervals", OFFSET(master_publish_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, UINT_MAX, E},
+ { "write_prft", "Write producer reference time element", OFFSET(write_prft), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, E},
+ { "mpd_profile", "Set profiles. Elements and values used in the manifest may be constrained by them", OFFSET(profile), AV_OPT_TYPE_FLAGS, {.i64 = MPD_PROFILE_DASH }, 0, UINT_MAX, E, "mpd_profile"},
+ { "dash", "MPEG-DASH ISO Base media file format live profile", 0, AV_OPT_TYPE_CONST, {.i64 = MPD_PROFILE_DASH }, 0, UINT_MAX, E, "mpd_profile"},
+ { "dvb_dash", "DVB-DASH profile", 0, AV_OPT_TYPE_CONST, {.i64 = MPD_PROFILE_DVB }, 0, UINT_MAX, E, "mpd_profile"},
+ { "http_opts", "HTTP protocol options", OFFSET(http_opts), AV_OPT_TYPE_DICT, { .str = NULL }, 0, 0, E },
+ { "target_latency", "Set desired target latency for Low-latency dash", OFFSET(target_latency), AV_OPT_TYPE_DURATION, { .i64 = 0 }, 0, INT_MAX, E },
{ NULL },
};
projects / ffmpeg / blobdiff