virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/hlsenc: fix hls start and tail segment duration

Browse Source 
problem

fix ticket: #6067

Tested-by: Pero
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
This commit is contained in:
Steven Liu
2017-01-11 04:33:13 +08:00
parent d9c2cfd316
commit 2deafd9898
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/hlsenc.c
View File

@@ -103,6 +103,8 @@ typedef struct HLSContext {
int64_t recording_time; int64_t recording_time;
int has_video; int has_video;
int has_subtitle; int has_subtitle;
int new_start;
double dpp; // duration per packet
int64_t start_pts; int64_t start_pts;
int64_t end_pts; int64_t end_pts;
double duration; // last segment duration computed so far, in seconds double duration; // last segment duration computed so far, in seconds
@@ -418,6 +420,7 @@ static int hls_mux_init(AVFormatContext *s)
st->time_base = s->streams[i]->time_base; st->time_base = s->streams[i]->time_base;
} }
hls->start_pos = 0; hls->start_pos = 0;
hls->new_start = 1;
return 0; return 0;
} }
@@ -1216,10 +1219,18 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt)
if (pkt->pts == AV_NOPTS_VALUE) if (pkt->pts == AV_NOPTS_VALUE)
is_ref_pkt = can_split = 0; is_ref_pkt = can_split = 0;
if (is_ref_pkt) if (is_ref_pkt) {
hls->duration = (double)(pkt->pts - hls->end_pts) if (hls->new_start) {
* st->time_base.num / st->time_base.den; hls->new_start = 0;
hls->duration = (double)(pkt->pts - hls->end_pts)
* st->time_base.num / st->time_base.den;
hls->dpp = (double)(pkt->duration) * st->time_base.num / st->time_base.den;
av_log(s, AV_LOG_ERROR, "hls->dpp = [%lf]\n", hls->dpp);
} else {
hls->duration += (double)(pkt->duration) * st->time_base.num / st->time_base.den;
}
}
if (can_split && av_compare_ts(pkt->pts - hls->start_pts, st->time_base, if (can_split && av_compare_ts(pkt->pts - hls->start_pts, st->time_base,
end_pts, AV_TIME_BASE_Q) >= 0) { end_pts, AV_TIME_BASE_Q) >= 0) {
int64_t new_start_pos; int64_t new_start_pos;
@@ -1289,7 +1300,8 @@ static int hls_write_trailer(struct AVFormatContext *s)
if (oc->pb) { if (oc->pb) {
hls->size = avio_tell(hls->avf->pb) - hls->start_pos; hls->size = avio_tell(hls->avf->pb) - hls->start_pos;
ff_format_io_close(s, &oc->pb); ff_format_io_close(s, &oc->pb);
hls_append_segment(s, hls, hls->duration, hls->start_pos, hls->size); /* after av_write_trailer, then duration + 1 duration per packet */
hls_append_segment(s, hls, hls->duration + hls->dpp, hls->start_pos, hls->size);
} }
if (vtt_oc) { if (vtt_oc) {