har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '456e93bfdd4cbc5e995dea415019abd0703d0e16'

Browse Source 
* commit '456e93bfdd4cbc5e995dea415019abd0703d0e16':
  dashenc: Adjust the start time of a segment to the end of the previous segment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-17 11:57:35 +01:00
commit 973684a4fb
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/dashenc.c
View File

@ -654,6 +654,7 @@ static int dash_write_header(AVFormatContext *s)
set_codec_str(s, os->ctx->streams[0]->codec, os->codec_str, sizeof(os->codec_str)); set_codec_str(s, os->ctx->streams[0]->codec, os->codec_str, sizeof(os->codec_str));
os->first_dts = AV_NOPTS_VALUE; os->first_dts = AV_NOPTS_VALUE;
os->end_dts = AV_NOPTS_VALUE;
os->segment_index = 1; os->segment_index = 1;
} }
@ -863,8 +864,15 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
} }
if (!os->packets_written) if (!os->packets_written) {
os->start_dts = pkt->dts; // If we wrote a previous segment, adjust the start time of the segment
// to the end of the previous one (which is the same as the mp4 muxer
// does). This avoids gaps in the timeline.
if (os->end_dts != AV_NOPTS_VALUE)
os->start_dts = os->end_dts;
else
os->start_dts = pkt->dts;
}
os->end_dts = pkt->dts + pkt->duration; os->end_dts = pkt->dts + pkt->duration;
os->packets_written++; os->packets_written++;
return ff_write_chained(os->ctx, 0, pkt, s, 0); return ff_write_chained(os->ctx, 0, pkt, s, 0);