RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/dashenc: Added #EXT-X-PROGRAM-DATE-TIME to HLS playlists

This commit is contained in:
joepadmiraal 2019-03-05 15:37:10 +01:00 committed by Karthick J
parent db332832a1
commit 056a2ac168
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/dashenc.c
View File

@ -61,6 +61,7 @@ typedef struct Segment {
int64_t start_pos; int64_t start_pos;
int range_length, index_length; int range_length, index_length;
int64_t time; int64_t time;
double prog_date_time;
int64_t duration; int64_t duration;
int n; int n;
} Segment; } Segment;
@ -122,6 +123,7 @@ typedef struct DASHContext {
int64_t last_duration; int64_t last_duration;
int64_t total_duration; int64_t total_duration;
char availability_start_time[100]; char availability_start_time[100];
time_t start_time_s;
char dirname[1024]; char dirname[1024];
const char *single_file_name; /* file names as specified in options */ const char *single_file_name; /* file names as specified in options */
const char *init_seg_name; const char *init_seg_name;
@ -433,6 +435,7 @@ static void write_hls_media_playlist(OutputStream *os, AVFormatContext *s,
const char *proto = avio_find_protocol_name(c->dirname); const char *proto = avio_find_protocol_name(c->dirname);
int use_rename = proto && !strcmp(proto, "file"); int use_rename = proto && !strcmp(proto, "file");
int i, start_index, start_number; int i, start_index, start_number;
double prog_date_time = 0;
get_start_index_number(os, c, &start_index, &start_number); get_start_index_number(os, c, &start_index, &start_number);
@ -467,11 +470,20 @@ static void write_hls_media_playlist(OutputStream *os, AVFormatContext *s,
for (i = start_index; i < os->nb_segments; i++) { for (i = start_index; i < os->nb_segments; i++) {
Segment *seg = os->segments[i]; Segment *seg = os->segments[i];
if (prog_date_time == 0) {
if (os->nb_segments == 1)
prog_date_time = c->start_time_s;
else
prog_date_time = seg->prog_date_time;
}
seg->prog_date_time = prog_date_time;
ret = ff_hls_write_file_entry(c->m3u8_out, 0, c->single_file, ret = ff_hls_write_file_entry(c->m3u8_out, 0, c->single_file,
(double) seg->duration / timescale, 0, (double) seg->duration / timescale, 0,
seg->range_length, seg->start_pos, NULL, seg->range_length, seg->start_pos, NULL,
c->single_file ? os->initfile : seg->file, c->single_file ? os->initfile : seg->file,
NULL); &prog_date_time);
if (ret < 0) { if (ret < 0) {
av_log(os->ctx, AV_LOG_WARNING, "ff_hls_write_file_entry get error\n"); av_log(os->ctx, AV_LOG_WARNING, "ff_hls_write_file_entry get error\n");
} }
@ -1592,9 +1604,12 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt)
os->first_pts = pkt->pts; os->first_pts = pkt->pts;
os->last_pts = pkt->pts; os->last_pts = pkt->pts;
if (!c->availability_start_time[0]) 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, format_date_now(c->availability_start_time,
sizeof(c->availability_start_time)); sizeof(c->availability_start_time));
}
if (!os->availability_time_offset && pkt->duration) { if (!os->availability_time_offset && pkt->duration) {
int64_t frame_duration = av_rescale_q(pkt->duration, st->time_base, int64_t frame_duration = av_rescale_q(pkt->duration, st->time_base,