} Segment;
typedef struct AdaptationSet {
- char id[10];
+ int id;
char *descriptor;
int64_t seg_duration;
int64_t frag_duration;
int max_width, max_height;
int nb_streams;
AVRational par;
+ int trick_idx;
} AdaptationSet;
typedef struct OutputStream {
int64_t last_dts, last_pts;
int last_flags;
int bit_rate;
+ int first_segment_bit_rate;
SegmentType segment_type; /* segment type selected for this particular stream */
const char *format_name;
const char *extension_name;
char full_path[1024];
char temp_path[1024];
double availability_time_offset;
- int64_t producer_reference_time;
+ AVProducerReferenceTime producer_reference_time;
char producer_reference_time_str[100];
int total_pkt_size;
int64_t total_pkt_duration;
int frag_type;
int64_t gop_size;
AVRational sar;
+ int coding_dependency;
} OutputStream;
typedef struct DASHContext {
int nb_as;
int window_size;
int extra_window_size;
-#if FF_API_DASH_MIN_SEG_DURATION
- int min_seg_duration;
-#endif
int64_t seg_duration;
int64_t frag_duration;
int remove_at_exit;
const char *utc_timing_url;
const char *method;
const char *user_agent;
- char *http_opts;
+ AVDictionary *http_opts;
int hls_playlist;
+ const char *hls_master_name;
int http_persistent;
int master_playlist_created;
AVIOContext *mpd_out;
int frag_type;
int write_prft;
int64_t max_gop_size;
+ int64_t max_segment_duration;
int profile;
+ int64_t target_latency;
+ int target_latency_refid;
+ AVRational min_playback_rate;
+ AVRational max_playback_rate;
+ int64_t update_period;
} DASHContext;
static struct codec_string {
{
if (c->method)
av_dict_set(options, "method", c->method, 0);
- if (c->http_opts)
- av_dict_parse_string(options, c->http_opts, "=", ",", 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)
avio_printf(out, "availabilityTimeOffset=\"%.3f\" ",
os->availability_time_offset);
}
- if (c->ldash && !final && os->frag_type != FRAG_TYPE_NONE &&
- (os->frag_type != FRAG_TYPE_DURATION || os->frag_duration != os->seg_duration))
+ if (c->streaming && os->availability_time_offset && !final)
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);
AVDictionaryEntry *lang, *role;
int i;
- avio_printf(out, "\t\t<AdaptationSet id=\"%s\" contentType=\"%s\" segmentAlignment=\"true\" bitstreamSwitching=\"true\"",
+ avio_printf(out, "\t\t<AdaptationSet id=\"%d\" contentType=\"%s\" startWithSAP=\"1\" segmentAlignment=\"true\" bitstreamSwitching=\"true\"",
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);
avio_printf(out, " lang=\"%s\"", lang->value);
avio_printf(out, ">\n");
- if (!final && c->ldash && as->max_frag_duration)
+ if (!final && c->ldash && as->max_frag_duration && !(c->profile & MPD_PROFILE_DVB))
avio_printf(out, "\t\t\t<Resync dT=\"%"PRId64"\" type=\"0\"/>\n", as->max_frag_duration);
+ if (as->trick_idx >= 0)
+ avio_printf(out, "\t\t\t<EssentialProperty id=\"%d\" schemeIdUri=\"http://dashif.org/guidelines/trickmode\" value=\"%d\"/>\n", as->id, as->trick_idx);
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);
continue;
if (os->bit_rate > 0)
- snprintf(bandwidth_str, sizeof(bandwidth_str), " bandwidth=\"%d\"",
- os->bit_rate);
+ snprintf(bandwidth_str, sizeof(bandwidth_str), " bandwidth=\"%d\"", os->bit_rate);
+ else if (final) {
+ int average_bit_rate = os->pos * 8 * AV_TIME_BASE / c->total_duration;
+ snprintf(bandwidth_str, sizeof(bandwidth_str), " bandwidth=\"%d\"", average_bit_rate);
+ } else if (os->first_segment_bit_rate > 0)
+ snprintf(bandwidth_str, sizeof(bandwidth_str), " bandwidth=\"%d\"", os->first_segment_bit_rate);
if (as->media_type == AVMEDIA_TYPE_VIDEO) {
avio_printf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"video/%s\" codecs=\"%s\"%s width=\"%d\" height=\"%d\"",
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);
+ if (as->trick_idx >= 0) {
+ AdaptationSet *tas = &c->as[as->trick_idx];
+ if (!as->ambiguous_frame_rate && !tas->ambiguous_frame_rate)
+ avio_printf(out, " maxPlayoutRate=\"%d\"", FFMAX((int)av_q2d(av_div_q(tas->min_frame_rate, as->min_frame_rate)), 1));
+ }
+ if (!os->coding_dependency)
+ avio_printf(out, " codingDependency=\"false\"");
avio_printf(out, ">\n");
} else {
avio_printf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"audio/%s\" codecs=\"%s\"%s audioSamplingRate=\"%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<ProducerReferenceTime id=\"%d\" inband=\"true\" type=\"%s\" wallClockTime=\"%s\" presentationTime=\"%"PRId64"\">\n",
+ i, os->producer_reference_time.flags ? "captured" : "encoder", 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 &&
+ if (!final && c->ldash && os->gop_size && os->frag_type != FRAG_TYPE_NONE && !(c->profile & MPD_PROFILE_DVB) &&
(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);
memset(*as, 0, sizeof(**as));
(*as)->media_type = type;
(*as)->frag_type = -1;
+ (*as)->trick_idx = -1;
return 0;
}
for (i = 0; i < s->nb_streams; i++) {
if ((ret = add_adaptation_set(s, &as, s->streams[i]->codecpar->codec_type)) < 0)
return ret;
- snprintf(as->id, sizeof(as->id), "%d", i);
+ as->id = i;
c->streams[i].as_idx = c->nb_as;
++as->nb_streams;
// 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,frag_duration=0.5,streams=0,1,2 and so on
+ // option id=0,seg_duration=2.5,frag_duration=0.5,streams=0,1,2
+ // id=1,trick_id=0,seg_duration=10,frag_type=none,streams=3 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 and frag_duration have the same syntax as the global options of
p++;
continue;
} else if (state == new_set && av_strstart(p, "id=", &p)) {
+ char id_str[10], *end_str;
+
+ n = strcspn(p, ",");
+ snprintf(id_str, sizeof(id_str), "%.*s", n, p);
+
+ i = strtol(id_str, &end_str, 10);
+ if (id_str == end_str || i < 0 || i > c->nb_as) {
+ av_log(s, AV_LOG_ERROR, "\"%s\" is not a valid value for an AdaptationSet id\n", id_str);
+ return AVERROR(EINVAL);
+ }
if ((ret = add_adaptation_set(s, &as, AVMEDIA_TYPE_UNKNOWN)) < 0)
return ret;
-
- n = strcspn(p, ",");
- snprintf(as->id, sizeof(as->id), "%.*s", n, p);
+ as->id = i;
p += n;
if (*p)
return AVERROR(EINVAL);
}
p += n;
+ if (*p)
+ p++;
+ state = parse_default;
+ } else if ((state != new_set) && av_strstart(p, "trick_id=", &p)) {
+ char trick_id_str[10], *end_str;
+
+ n = strcspn(p, ",");
+ snprintf(trick_id_str, sizeof(trick_id_str), "%.*s", n, p);
+ p += n;
+
+ as->trick_idx = strtol(trick_id_str, &end_str, 10);
+ if (trick_id_str == end_str || as->trick_idx < 0)
+ return AVERROR(EINVAL);
+
if (*p)
p++;
state = parse_default;
return AVERROR(EINVAL);
}
}
+
+ // check references for trick mode AdaptationSet
+ for (i = 0; i < c->nb_as; i++) {
+ as = &c->as[i];
+ if (as->trick_idx < 0)
+ continue;
+ for (n = 0; n < c->nb_as; n++) {
+ if (c->as[n].id == as->trick_idx)
+ break;
+ }
+ if (n >= c->nb_as) {
+ av_log(s, AV_LOG_ERROR, "reference AdaptationSet id \"%d\" not found for trick mode AdaptationSet id \"%d\"\n", as->trick_idx, as->id);
+ return AVERROR(EINVAL);
+ }
+ }
+
return 0;
}
char now_str[100];
if (c->use_template && !c->use_timeline)
update_period = 500;
+ if (c->update_period)
+ update_period = c->update_period;
avio_printf(out, "\tminimumUpdatePeriod=\"PT%"PRId64"S\"\n", update_period);
if (!c->ldash)
avio_printf(out, "\tsuggestedPresentationDelay=\"PT%"PRId64"S\"\n", c->last_duration / AV_TIME_BASE);
avio_printf(out, "\"\n");
}
}
+ avio_printf(out, "\tmaxSegmentDuration=\"");
+ write_time(out, c->max_segment_duration);
+ avio_printf(out, "\"\n");
avio_printf(out, "\tminBufferTime=\"");
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");
+ avio_printf(out, "\t<ServiceDescription id=\"0\">\n");
+ if (!final && c->target_latency && c->target_latency_refid >= 0) {
+ 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");
+ }
+ if (av_cmp_q(c->min_playback_rate, (AVRational) {1, 1}) ||
+ av_cmp_q(c->max_playback_rate, (AVRational) {1, 1}))
+ avio_printf(out, "\t\t<PlaybackRate min=\"%.2f\" max=\"%.2f\"/>\n",
+ av_q2d(c->min_playback_rate), av_q2d(c->max_playback_rate));
+ 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];
int start_index = FFMAX(os->nb_segments - c->window_size, 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;
}
return 0;
if (*c->dirname)
- snprintf(filename_hls, sizeof(filename_hls), "%smaster.m3u8", c->dirname);
+ snprintf(filename_hls, sizeof(filename_hls), "%s%s", c->dirname, c->hls_master_name);
else
- snprintf(filename_hls, sizeof(filename_hls), "master.m3u8");
+ snprintf(filename_hls, sizeof(filename_hls), "%s", c->hls_master_name);
snprintf(temp_filename, sizeof(temp_filename), use_rename ? "%s.tmp" : "%s", filename_hls);
OutputStream *os = &c->streams[i];
char *agroup = NULL;
char *codec_str_ptr = NULL;
- int stream_bitrate = st->codecpar->bit_rate + os->muxer_overhead;
+ int stream_bitrate = os->muxer_overhead;
+ if (os->bit_rate > 0)
+ stream_bitrate += os->bit_rate;
+ else if (final)
+ stream_bitrate += os->pos * 8 * AV_TIME_BASE / c->total_duration;
+ else if (os->first_segment_bit_rate > 0)
+ stream_bitrate += os->first_segment_bit_rate;
if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO)
continue;
if (os->segment_type != SEGMENT_TYPE_MP4)
get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i);
ff_hls_write_stream_info(st, c->m3u8_out, stream_bitrate,
playlist_file, agroup,
- codec_str_ptr, NULL);
+ codec_str_ptr, NULL, NULL);
}
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;
}
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->seg_duration = c->min_seg_duration;
- }
-#endif
if (c->lhls && s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
av_log(s, AV_LOG_ERROR,
"LHLS is experimental, Please set -strict experimental in order to enable it.\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;
c->frag_type = FRAG_TYPE_EVERY_FRAME;
}
+ if (c->write_prft < 0) {
+ c->write_prft = c->ldash;
+ if (c->ldash)
+ av_log(s, AV_LOG_VERBOSE, "Enabling Producer Reference Time element for Low Latency mode\n");
+ }
+
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;
c->write_prft = 0;
}
+ if (c->ldash && !c->write_prft) {
+ av_log(s, AV_LOG_WARNING, "Low Latency mode enabled without Producer Reference Time element option! Resulting manifest may not be complaint\n");
+ }
+
+ 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;
+ }
+
+ if (av_cmp_q(c->max_playback_rate, c->min_playback_rate) < 0) {
+ av_log(s, AV_LOG_WARNING, "Minimum playback rate value is higer than the Maximum. Both will be ignored\n");
+ c->min_playback_rate = c->max_playback_rate = (AVRational) {1, 1};
+ }
+
av_strlcpy(c->dirname, s->url, sizeof(c->dirname));
ptr = strrchr(c->dirname, '/');
if (ptr) {
os->frag_duration = as->frag_duration;
os->frag_type = as->frag_type;
+ c->max_segment_duration = FFMAX(c->max_segment_duration, as->seg_duration);
+
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);
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->frag_type != FRAG_TYPE_PFRAMES && as->trick_idx < 0)
+ // Set this now if a parser isn't used
+ os->coding_dependency = 1;
if (os->segment_type == SEGMENT_TYPE_MP4) {
if (c->streaming)
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);
+ av_log(s, AV_LOG_ERROR, "Conflicting stream aspect ratios values in Adaptation Set %d. Please ensure all adaptation sets have the same aspect ratio\n", os->as_idx);
return AVERROR(EINVAL);
}
as->par = par;
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;
}
Segment *seg;
if (os->nb_segments >= os->segments_size) {
os->segments_size = (os->segments_size + 1) * 2;
- if ((err = av_reallocp(&os->segments, sizeof(*os->segments) *
+ if ((err = av_reallocp_array(&os->segments, sizeof(*os->segments),
os->segments_size)) < 0) {
os->segments_size = 0;
os->nb_segments = 0;
{
AVCodecParameters *par = os->ctx->streams[0]->codecpar;
uint8_t *extradata;
- int ret, extradata_size;
+ size_t extradata_size;
+ int ret;
if (par->extradata_size)
return 0;
static int dashenc_delete_segment_file(AVFormatContext *s, const char* file)
{
DASHContext *c = s->priv_data;
- size_t dirname_len, file_len;
- char filename[1024];
+ AVBPrint buf;
- dirname_len = strlen(c->dirname);
- if (dirname_len >= sizeof(filename)) {
- av_log(s, AV_LOG_WARNING, "Cannot delete segments as the directory path is too long: %"PRIu64" characters: %s\n",
- (uint64_t)dirname_len, c->dirname);
- return AVERROR(ENAMETOOLONG);
- }
-
- memcpy(filename, c->dirname, dirname_len);
+ av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED);
- file_len = strlen(file);
- if ((dirname_len + file_len) >= sizeof(filename)) {
- av_log(s, AV_LOG_WARNING, "Cannot delete segments as the path is too long: %"PRIu64" characters: %s%s\n",
- (uint64_t)(dirname_len + file_len), c->dirname, file);
- return AVERROR(ENAMETOOLONG);
+ av_bprintf(&buf, "%s%s", c->dirname, file);
+ if (!av_bprint_is_complete(&buf)) {
+ av_bprint_finalize(&buf, NULL);
+ av_log(s, AV_LOG_WARNING, "Out of memory for filename\n");
+ return AVERROR(ENOMEM);
}
- memcpy(filename + dirname_len, file, file_len + 1); // include the terminating zero
- dashenc_delete_file(s, filename);
+ dashenc_delete_file(s, buf.str);
+ av_bprint_finalize(&buf, NULL);
return 0;
}
OutputStream *os = &c->streams[i];
AVStream *st = s->streams[i];
int range_length, index_length = 0;
+ int64_t duration;
if (!os->packets_written)
continue;
continue;
}
- if (!c->single_file) {
- if (os->segment_type == SEGMENT_TYPE_MP4 && !os->written_len)
- write_styp(os->ctx->pb);
- } else {
+ if (c->single_file)
snprintf(os->full_path, sizeof(os->full_path), "%s%s", c->dirname, os->initfile);
- }
ret = flush_dynbuf(c, os, &range_length);
if (ret < 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;
}
}
- os->last_duration = FFMAX(os->last_duration, av_rescale_q(os->max_pts - os->start_pts,
- st->time_base,
- AV_TIME_BASE_Q));
+ duration = av_rescale_q(os->max_pts - os->start_pts, st->time_base, AV_TIME_BASE_Q);
+ os->last_duration = FFMAX(os->last_duration, duration);
- 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);
+ 8 * AV_TIME_BASE) / duration;
os->total_pkt_size = 0;
os->total_pkt_duration = 0;
- if (!os->bit_rate) {
- // calculate average bitrate of first segment
- int64_t bitrate = (int64_t) range_length * 8 * AV_TIME_BASE / av_rescale_q(os->max_pts - os->start_pts,
- st->time_base,
- AV_TIME_BASE_Q);
- if (bitrate >= 0)
- os->bit_rate = bitrate;
+ if (!os->bit_rate && !os->first_segment_bit_rate) {
+ os->first_segment_bit_rate = (int64_t) range_length * 8 * AV_TIME_BASE / duration;
}
add_segment(os, os->filename, os->start_pts, os->max_pts - os->start_pts, os->pos, range_length, index_length, next_exp_index);
av_log(s, AV_LOG_VERBOSE, "Representation %d media segment %d written to: %s\n", i, os->segment_index, os->full_path);
return ret;
}
+static int dash_parse_prft(DASHContext *c, AVPacket *pkt)
+{
+ OutputStream *os = &c->streams[pkt->stream_index];
+ AVProducerReferenceTime *prft;
+ size_t side_data_size;
+
+ prft = (AVProducerReferenceTime *)av_packet_get_side_data(pkt, AV_PKT_DATA_PRFT, &side_data_size);
+ if (!prft || side_data_size != sizeof(AVProducerReferenceTime) || (prft->flags && prft->flags != 24)) {
+ // No encoder generated or user provided capture time AVProducerReferenceTime side data. Instead
+ // of letting the mov muxer generate one, do it here so we can also use it for the manifest.
+ prft = (AVProducerReferenceTime *)av_packet_new_side_data(pkt, AV_PKT_DATA_PRFT,
+ sizeof(AVProducerReferenceTime));
+ if (!prft)
+ return AVERROR(ENOMEM);
+ prft->wallclock = av_gettime();
+ prft->flags = 24;
+ }
+ if (os->first_pts == AV_NOPTS_VALUE) {
+ os->producer_reference_time = *prft;
+ if (c->target_latency_refid < 0)
+ c->target_latency_refid = pkt->stream_index;
+ }
+
+ return 0;
+}
+
static int dash_write_packet(AVFormatContext *s, AVPacket *pkt)
{
DASHContext *c = s->priv_data;
pkt->dts = 0;
}
+ if (c->write_prft) {
+ ret = dash_parse_prft(c, pkt);
+ if (ret < 0)
+ return ret;
+ }
+
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;
os->first_pts = pkt->pts;
}
os->last_pts = pkt->pts;
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))) {
+ AdaptationSet *as = &c->as[os->as_idx - 1];
int64_t frame_duration = 0;
switch (os->frag_type) {
seg_end_duration = os->seg_duration;
}
+ if (os->parser &&
+ (os->frag_type == FRAG_TYPE_PFRAMES ||
+ as->trick_idx >= 0)) {
+ // Parse the packets only in scenarios where it's needed
+ uint8_t *data;
+ int size;
+ av_parser_parse2(os->parser, os->parser_avctx,
+ &data, &size, pkt->data, pkt->size,
+ pkt->pts, pkt->dts, pkt->pos);
+
+ os->coding_dependency |= os->parser->pict_type != AV_PICTURE_TYPE_I;
+ }
+
if (pkt->flags & AV_PKT_FLAG_KEY && os->packets_written &&
av_compare_ts(elapsed_duration, st->time_base,
seg_end_duration, AV_TIME_BASE_Q) >= 0) {
if (!c->has_video || st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
- c->last_duration = av_rescale_q(pkt->pts - os->start_pts,
- st->time_base,
- AV_TIME_BASE_Q);
- c->total_duration = av_rescale_q(pkt->pts - os->first_pts,
- st->time_base,
- AV_TIME_BASE_Q);
-
- if ((!c->use_timeline || !c->use_template) && os->last_duration) {
- if (c->last_duration < os->last_duration*9/10 ||
- c->last_duration > os->last_duration*11/10) {
- av_log(s, AV_LOG_WARNING,
- "Segment durations differ too much, enable use_timeline "
- "and use_template, or keep a stricter keyframe interval\n");
+ c->last_duration = av_rescale_q(pkt->pts - os->start_pts,
+ st->time_base,
+ AV_TIME_BASE_Q);
+ c->total_duration = av_rescale_q(pkt->pts - os->first_pts,
+ st->time_base,
+ AV_TIME_BASE_Q);
+
+ if ((!c->use_timeline || !c->use_template) && os->last_duration) {
+ if (c->last_duration < os->last_duration*9/10 ||
+ c->last_duration > os->last_duration*11/10) {
+ av_log(s, AV_LOG_WARNING,
+ "Segment durations differ too much, enable use_timeline "
+ "and use_template, or keep a stricter keyframe interval\n");
+ }
}
}
- }
- if (c->write_prft && os->producer_reference_time && !os->producer_reference_time_str[0])
+ if (c->write_prft && os->producer_reference_time.wallclock && !os->producer_reference_time_str[0])
format_date(os->producer_reference_time_str,
sizeof(os->producer_reference_time_str),
- os->producer_reference_time);
+ os->producer_reference_time.wallclock);
if ((ret = dash_flush(s, 0, pkt->stream_index)) < 0)
return ret;
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)) ||
}
}
- if (pkt->flags & AV_PKT_FLAG_KEY && (os->packets_written || os->nb_segments) && !os->gop_size) {
+ if (pkt->flags & AV_PKT_FLAG_KEY && (os->packets_written || os->nb_segments) && !os->gop_size && as->trick_idx < 0) {
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);
}
AVDictionary *opts = NULL;
const char *proto = avio_find_protocol_name(s->url);
int use_rename = proto && !strcmp(proto, "file");
+ if (os->segment_type == SEGMENT_TYPE_MP4)
+ write_styp(os->ctx->pb);
os->filename[0] = os->full_path[0] = os->temp_path[0] = '\0';
ff_dash_fill_tmpl_params(os->filename, sizeof(os->filename),
os->media_seg_name, pkt->stream_index,
if (c->streaming && os->segment_type == SEGMENT_TYPE_MP4) {
int len = 0;
uint8_t *buf = NULL;
- if (!os->written_len)
- write_styp(os->ctx->pb);
avio_flush(os->ctx->pb);
len = avio_get_dyn_buf (os->ctx->pb, &buf);
if (os->out) {
if (c->hls_playlist && c->master_playlist_created) {
char filename[1024];
- snprintf(filename, sizeof(filename), "%smaster.m3u8", c->dirname);
+ snprintf(filename, sizeof(filename), "%s%s", c->dirname, c->hls_master_name);
dashenc_delete_file(s, filename);
}
}
if (ret == 1) {
AVStream *st = s->streams[avpkt->stream_index];
AVStream *ost = oc->streams[0];
- st->internal->bsfcs = ost->internal->bsfcs;
- st->internal->nb_bsfcs = ost->internal->nb_bsfcs;
- ost->internal->bsfcs = NULL;
- ost->internal->nb_bsfcs = 0;
+ st->internal->bsfc = ost->internal->bsfc;
+ ost->internal->bsfc = NULL;
}
return ret;
}
{ "adaptation_sets", "Adaptation sets. Syntax: id=0,streams=0,1,2 id=1,streams=3,4 and so on", OFFSET(adaptation_sets), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
{ "window_size", "number of segments kept in the manifest", OFFSET(window_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, E },
{ "extra_window_size", "number of segments kept outside of the manifest before removing from disk", OFFSET(extra_window_size), AV_OPT_TYPE_INT, { .i64 = 5 }, 0, INT_MAX, E },
-#if FF_API_DASH_MIN_SEG_DURATION
- { "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"},
{ "http_user_agent", "override User-Agent field in HTTP header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E},
{ "http_persistent", "Use persistent HTTP connections", OFFSET(http_persistent), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E },
{ "hls_playlist", "Generate HLS playlist files(master.m3u8, media_%d.m3u8)", OFFSET(hls_playlist), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },
+ { "hls_master_name", "HLS master playlist name", OFFSET(hls_master_name), AV_OPT_TYPE_STRING, {.str = "master.m3u8"}, 0, 0, E },
{ "streaming", "Enable/Disable streaming mode of output. Each frame will be moof fragment", OFFSET(streaming), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E },
{ "timeout", "set timeout for socket I/O operations", OFFSET(timeout), AV_OPT_TYPE_DURATION, { .i64 = -1 }, -1, INT_MAX, .flags = E },
{ "index_correction", "Enable/Disable segment index correction logic", OFFSET(index_correction), 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},
+ { "write_prft", "Write producer reference time element", OFFSET(write_prft), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 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_STRING, { .str = NULL }, 0, 0, E },
+ { "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 },
+ { "min_playback_rate", "Set desired minimum playback rate", OFFSET(min_playback_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 1.0 }, 0.5, 1.5, E },
+ { "max_playback_rate", "Set desired maximum playback rate", OFFSET(max_playback_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 1.0 }, 0.5, 1.5, E },
+ { "update_period", "Set the mpd update interval", OFFSET(update_period), AV_OPT_TYPE_INT64, {.i64 = 0}, 0, INT64_MAX, E},
{ NULL },
};