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;
} DASHContext;
static struct codec_string {
AVDictionaryEntry *lang, *role;
int i;
- avio_printf(out, "\t\t<AdaptationSet id=\"%d\" 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);
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=\"%s\" wallclockTime=\"%s\" presentationTime=\"%"PRId64"\">\n",
+ 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");
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");
av_free(escaped);
}
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<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 (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];
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)
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);
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;
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];
-
- 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);
- }
+ AVBPrint buf;
- 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;
}
}
- 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 && 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);
+ int64_t bitrate = (int64_t) range_length * 8 * AV_TIME_BASE / duration;
if (bitrate >= 0)
os->bit_rate = bitrate;
}
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.wallclock && !os->producer_reference_time_str[0])
format_date(os->producer_reference_time_str,
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;
}
{ "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 },
+ { "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 },
{ NULL },
};
projects / ffmpeg / blobdiff