Re: [FFmpeg-devel] [PATCH] mov: Make sure PTS are both monotonically increasing, and unique
On 30/05/2018 00:48, Michael Niedermayer wrote: >> Sorry I missed that! I'd prefer to use your patch over mine. > > iam fine with sasis original patch too Pushed with the changes that were requested in that thread. - Derek ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] mov: Make sure PTS are both monotonically increasing, and unique
On Tue, May 29, 2018 at 07:20:33PM +0100, Derek Buitenhuis wrote: > Hi, > > On Tue, May 29, 2018 at 5:04 PM, Sasi Inguva > wrote: > > Hi. sorry for the late reply. I sent a patch similar to this a while back > > https://patchwork.ffmpeg.org/patch/8227/ but it got lost in the sea. You > > also want to do, > > Sorry I missed that! I'd prefer to use your patch over mine. iam fine with sasis original patch too [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB It is what and why we do it that matters, not just one of them. signature.asc Description: PGP signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] mov: Make sure PTS are both monotonically increasing, and unique
Hi, On Tue, May 29, 2018 at 5:04 PM, Sasi Inguva wrote: > Hi. sorry for the late reply. I sent a patch similar to this a while back > https://patchwork.ffmpeg.org/patch/8227/ but it got lost in the sea. You > also want to do, Sorry I missed that! I'd prefer to use your patch over mine. I'll hold off on a push for a day or two until I figure out how to handle (or not handle) the midstream PTS. - Derek ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] mov: Make sure PTS are both monotonically increasing, and unique
Hi. sorry for the late reply. I sent a patch similar to this a while back
https://patchwork.ffmpeg.org/patch/8227/ but it got lost in the sea. You
also want to do,
@@ -3579,7 +3579,8 @@ static void mov_fix_index(MOVContext *mov, AVStream
*st)
frame_duration_buffer[num_discarded_begin - 1] =
frame_duration;
-if (first_non_zero_audio_edit > 0 &&
st->codecpar->codec_id != AV_CODEC_ID_VORBIS) {
+if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO
&&
+first_non_zero_audio_edit > 0 &&
st->codecpar->codec_id != AV_CODEC_ID_VORBIS) {
st->skip_samples += frame_duration;
}
so that we only increment skip samples for audio streams. Otherwise patch
looks good to me.
On Thu, May 17, 2018 at 7:03 AM Derek Buitenhuis
wrote:
> On Tue, May 15, 2018 at 8:44 PM, Derek Buitenhuis
> wrote:
> > We already did this for audio, but it should be done for video too.
> > If we don't, seeking back to the start of the file, for example, can
> > become quite broken, since the first N packets will have repeating
> > and nonmonotonic PTS, yet they need to be decoded even if they are
> > to be discarded.
> >
> > Signed-off-by: Derek Buitenhuis
> > ---
> > libavformat/mov.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Ping.
>
> Is nobody outside Sasi able to review code in this part of
> mov.c? That is slightly worrying to me.
>
> - Derek
> ___
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] mov: Make sure PTS are both monotonically increasing, and unique
On Tue, May 15, 2018 at 8:44 PM, Derek Buitenhuis wrote: > We already did this for audio, but it should be done for video too. > If we don't, seeking back to the start of the file, for example, can > become quite broken, since the first N packets will have repeating > and nonmonotonic PTS, yet they need to be decoded even if they are > to be discarded. > > Signed-off-by: Derek Buitenhuis > --- > libavformat/mov.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Ping. Is nobody outside Sasi able to review code in this part of mov.c? That is slightly worrying to me. - Derek ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] mov: Make sure PTS are both monotonically increasing, and unique
tis 2018-05-15 klockan 21:21 +0100 skrev Derek Buitenhuis: > On Tue, May 15, 2018 at 9:10 PM, Tomas Härdin > wrote: > > Why don't we do this for every format? > > In this case, it is specific to MOV and MP4, since it's caused by the > way we apply edit lists at the packet level (reordering, marking them > as discard, changing timestamps, etc.). Previously we didn't much > care to set the discard-flagged packet timestamps properly, which is > what this fixes. It's not a high-level vsync sort of thing. I see. Well, I don't remember too much about MOV these day so I'll leave this to someone else to actually comment on :o /Tomas ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] mov: Make sure PTS are both monotonically increasing, and unique
On Tue, May 15, 2018 at 9:10 PM, Tomas Härdin wrote: > Why don't we do this for every format? In this case, it is specific to MOV and MP4, since it's caused by the way we apply edit lists at the packet level (reordering, marking them as discard, changing timestamps, etc.). Previously we didn't much care to set the discard-flagged packet timestamps properly, which is what this fixes. It's not a high-level vsync sort of thing. - Derek ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] mov: Make sure PTS are both monotonically increasing, and unique
tis 2018-05-15 klockan 20:44 +0100 skrev Derek Buitenhuis: > We already did this for audio, but it should be done for video too. > If we don't, seeking back to the start of the file, for example, can > become quite broken, since the first N packets will have repeating > and nonmonotonic PTS, yet they need to be decoded even if they are > to be discarded. Why don't we do this for every format? /Tomas ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] mov: Make sure PTS are both monotonically increasing, and unique
We already did this for audio, but it should be done for video too.
If we don't, seeking back to the start of the file, for example, can
become quite broken, since the first N packets will have repeating
and nonmonotonic PTS, yet they need to be decoded even if they are
to be discarded.
Signed-off-by: Derek Buitenhuis
---
libavformat/mov.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 1975011..a74983f 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3579,7 +3579,7 @@ static void mov_fix_index(MOVContext *mov, AVStream *st)
flags |= AVINDEX_DISCARD_FRAME;
av_log(mov->fc, AV_LOG_DEBUG, "drop a frame at curr_cts:
%"PRId64" @ %"PRId64"\n", curr_cts, index);
-if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
edit_list_start_encountered == 0) {
+if (edit_list_start_encountered == 0) {
num_discarded_begin++;
frame_duration_buffer =
av_realloc(frame_duration_buffer,
num_discarded_begin
* sizeof(int64_t));
@@ -3605,7 +3605,7 @@ static void mov_fix_index(MOVContext *mov, AVStream *st)
edit_list_start_encountered = 1;
// Make timestamps strictly monotonically increasing for
audio, by rewriting timestamps for
// discarded packets.
-if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
frame_duration_buffer) {
+if (frame_duration_buffer) {
fix_index_entry_timestamps(st, st->nb_index_entries,
edit_list_dts_counter,
frame_duration_buffer,
num_discarded_begin);
av_freep(&frame_duration_buffer);
--
1.8.3.1
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
