| Message ID | 20200406174226.1299487-1-jstebbins@jetheaddev.com |
|---|---|
| State | Accepted |
| Commit | 99360990a916896421cb4173ba7bd8ce8878e4b5 |
| Headers | show |
| Series | [FFmpeg-devel] libavformat/mov: restore use of mfra time as dts | expand |
| Context | Check | Description |
|---|---|---|
| andriy/ffmpeg-patchwork | success | Make fate finished |
On 06-04-2020 11:12 pm, John Stebbins wrote: > This was inadvertantly removed in 4a9d32baca > --- > libavformat/mov.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/libavformat/mov.c b/libavformat/mov.c > index 16a40debc7..eee98fb69c 100644 > --- a/libavformat/mov.c > +++ b/libavformat/mov.c > @@ -4813,6 +4813,11 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) > pts = frag_stream_info->first_tfra_pts; > av_log(c->fc, AV_LOG_DEBUG, "found mfra time %"PRId64 > ", using it for pts\n", pts); > + } else if (frag_stream_info->first_tfra_pts != AV_NOPTS_VALUE && > + c->use_mfra_for == FF_MOV_FLAG_MFRA_DTS) { > + dts = frag_stream_info->first_tfra_pts; > + av_log(c->fc, AV_LOG_DEBUG, "found mfra time %"PRId64 > + ", using it for dts\n", pts); > } else if (frag_stream_info->sidx_pts != AV_NOPTS_VALUE) { > // FIXME: sidx earliest_presentation_time is *PTS*, s.b. > // pts = frag_stream_info->sidx_pts; LGTM. Gyan
On Thu, 2020-04-09 at 10:56 +0530, Gyan Doshi wrote: > > On 06-04-2020 11:12 pm, John Stebbins wrote: > > This was inadvertantly removed in 4a9d32baca > > --- > > libavformat/mov.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/libavformat/mov.c b/libavformat/mov.c > > index 16a40debc7..eee98fb69c 100644 > > --- a/libavformat/mov.c > > +++ b/libavformat/mov.c > > @@ -4813,6 +4813,11 @@ static int mov_read_trun(MOVContext *c, > > AVIOContext *pb, MOVAtom atom) > > pts = frag_stream_info->first_tfra_pts; > > av_log(c->fc, AV_LOG_DEBUG, "found mfra time %"PRId64 > > ", using it for pts\n", pts); > > + } else if (frag_stream_info->first_tfra_pts != > > AV_NOPTS_VALUE && > > + c->use_mfra_for == FF_MOV_FLAG_MFRA_DTS) { > > + dts = frag_stream_info->first_tfra_pts; > > + av_log(c->fc, AV_LOG_DEBUG, "found mfra time %"PRId64 > > + ", using it for dts\n", pts); > > } else if (frag_stream_info->sidx_pts != AV_NOPTS_VALUE) > > { > > // FIXME: sidx earliest_presentation_time is *PTS*, > > s.b. > > // pts = frag_stream_info->sidx_pts; > > LGTM. > > Gyan > Thanks for the review. I've got a couple other patch submissions that fix problems that resulted from 4a9d32baca which have received no comments in nearly 2 weeks. I don't have commit access, so if no comments means OK, can someone please commit? https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200329203245.225679-1-jstebbins@jetheaddev.com/ https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200329212738.226876-1-jstebbins@jetheaddev.com/
On 10-04-2020 08:04 pm, John Stebbins wrote: > On Thu, 2020-04-09 at 10:56 +0530, Gyan Doshi wrote: >> On 06-04-2020 11:12 pm, John Stebbins wrote: >>> This was inadvertantly removed in 4a9d32baca >>> --- >>> libavformat/mov.c | 5 +++++ >>> 1 file changed, 5 insertions(+) >>> >>> diff --git a/libavformat/mov.c b/libavformat/mov.c >>> index 16a40debc7..eee98fb69c 100644 >>> --- a/libavformat/mov.c >>> +++ b/libavformat/mov.c >>> @@ -4813,6 +4813,11 @@ static int mov_read_trun(MOVContext *c, >>> AVIOContext *pb, MOVAtom atom) >>> pts = frag_stream_info->first_tfra_pts; >>> av_log(c->fc, AV_LOG_DEBUG, "found mfra time %"PRId64 >>> ", using it for pts\n", pts); >>> + } else if (frag_stream_info->first_tfra_pts != >>> AV_NOPTS_VALUE && >>> + c->use_mfra_for == FF_MOV_FLAG_MFRA_DTS) { >>> + dts = frag_stream_info->first_tfra_pts; >>> + av_log(c->fc, AV_LOG_DEBUG, "found mfra time %"PRId64 >>> + ", using it for dts\n", pts); >>> } else if (frag_stream_info->sidx_pts != AV_NOPTS_VALUE) >>> { >>> // FIXME: sidx earliest_presentation_time is *PTS*, >>> s.b. >>> // pts = frag_stream_info->sidx_pts; >> LGTM. >> >> Gyan >> > Thanks for the review. I've got a couple other patch submissions that > fix problems that resulted from 4a9d32baca which have received no > comments in nearly 2 weeks. I don't have commit access, so if no > comments means OK, can someone please commit? > I'll push this one. Someone may want to review the others. Gyan
On 10-04-2020 09:20 pm, Gyan Doshi wrote: > > > On 10-04-2020 08:04 pm, John Stebbins wrote: >> On Thu, 2020-04-09 at 10:56 +0530, Gyan Doshi wrote: >>> On 06-04-2020 11:12 pm, John Stebbins wrote: >>>> This was inadvertantly removed in 4a9d32baca >>>> --- >>>> libavformat/mov.c | 5 +++++ >>>> 1 file changed, 5 insertions(+) >>>> >>>> diff --git a/libavformat/mov.c b/libavformat/mov.c >>>> index 16a40debc7..eee98fb69c 100644 >>>> --- a/libavformat/mov.c >>>> +++ b/libavformat/mov.c >>>> @@ -4813,6 +4813,11 @@ static int mov_read_trun(MOVContext *c, >>>> AVIOContext *pb, MOVAtom atom) >>>> pts = frag_stream_info->first_tfra_pts; >>>> av_log(c->fc, AV_LOG_DEBUG, "found mfra time %"PRId64 >>>> ", using it for pts\n", pts); >>>> + } else if (frag_stream_info->first_tfra_pts != >>>> AV_NOPTS_VALUE && >>>> + c->use_mfra_for == FF_MOV_FLAG_MFRA_DTS) { >>>> + dts = frag_stream_info->first_tfra_pts; >>>> + av_log(c->fc, AV_LOG_DEBUG, "found mfra time %"PRId64 >>>> + ", using it for dts\n", pts); >>>> } else if (frag_stream_info->sidx_pts != AV_NOPTS_VALUE) >>>> { >>>> // FIXME: sidx earliest_presentation_time is *PTS*, >>>> s.b. >>>> // pts = frag_stream_info->sidx_pts; >>> LGTM. >>> >>> Gyan >>> >> Thanks for the review. I've got a couple other patch submissions that >> fix problems that resulted from 4a9d32baca which have received no >> comments in nearly 2 weeks. I don't have commit access, so if no >> comments means OK, can someone please commit? >> > > I'll push this one. Someone may want to review the others. Pushed as 99360990a916896421cb4173ba7bd8ce8878e4b5 Gyan
diff --git a/libavformat/mov.c b/libavformat/mov.c index 16a40debc7..eee98fb69c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4813,6 +4813,11 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) pts = frag_stream_info->first_tfra_pts; av_log(c->fc, AV_LOG_DEBUG, "found mfra time %"PRId64 ", using it for pts\n", pts); + } else if (frag_stream_info->first_tfra_pts != AV_NOPTS_VALUE && + c->use_mfra_for == FF_MOV_FLAG_MFRA_DTS) { + dts = frag_stream_info->first_tfra_pts; + av_log(c->fc, AV_LOG_DEBUG, "found mfra time %"PRId64 + ", using it for dts\n", pts); } else if (frag_stream_info->sidx_pts != AV_NOPTS_VALUE) { // FIXME: sidx earliest_presentation_time is *PTS*, s.b. // pts = frag_stream_info->sidx_pts;