Commit bef3b1f5 authored by Martin Storsjö's avatar Martin Storsjö

movenc: Allow setting start_dts/start_cts before writing actual packets

By writing a zero-sized packet, the caller can communicate the
start_dts/start_cts for the stream without actually writing
the first packet.

This allows doing random-access writing of fragments when the
start dts of the stream isn't zero, so that the edit list in the moov
is written based on timestamps from the nominal start time signaled
via the zero-sized packet, while the first proper packet written
corresponds to a later fragment.

To avoid potential unexpected behaviour, empty packets only set
start_dts if the frag_discont flag is set.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 3eeb7edf
...@@ -3585,9 +3585,6 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -3585,9 +3585,6 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
int64_t frag_duration = 0; int64_t frag_duration = 0;
int size = pkt->size; int size = pkt->size;
if (!pkt->size)
return 0; /* Discard 0 sized packets */
if (mov->flags & FF_MOV_FLAG_FRAG_DISCONT) { if (mov->flags & FF_MOV_FLAG_FRAG_DISCONT) {
int i; int i;
for (i = 0; i < s->nb_streams; i++) for (i = 0; i < s->nb_streams; i++)
...@@ -3595,6 +3592,18 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -3595,6 +3592,18 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt)
mov->flags &= ~FF_MOV_FLAG_FRAG_DISCONT; mov->flags &= ~FF_MOV_FLAG_FRAG_DISCONT;
} }
if (!pkt->size) {
if (trk->start_dts == AV_NOPTS_VALUE && trk->frag_discont) {
trk->start_dts = pkt->dts;
if (pkt->pts != AV_NOPTS_VALUE)
trk->start_cts = pkt->pts - pkt->dts;
else
trk->start_cts = 0;
}
return 0; /* Discard 0 sized packets */
}
if (trk->entry) if (trk->entry)
frag_duration = av_rescale_q(pkt->dts - trk->cluster[0].dts, frag_duration = av_rescale_q(pkt->dts - trk->cluster[0].dts,
s->streams[pkt->stream_index]->time_base, s->streams[pkt->stream_index]->time_base,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment